diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java b/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
index 2bf229d812..f693ce6949 100644
--- a/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
+++ b/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
@@ -1160,7 +1160,7 @@ public class ProjectUri
                     }
 
                     public static String optional =
-                        "http://apache.org/maven/project/profiles#collection/profile/dependencies/dependency/optional";
+                        "http://apache.org/maven/project/profiles#collection/profile/dependencies#collection/dependency/optional";
                 }
             }
 
@@ -1179,49 +1179,49 @@ public class ProjectUri
                 public static class Plugins
                 {
                     public static String xUri =
-                        "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins";
+                        "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection";
 
                     public static class Plugin
                     {
                         public static String xUri =
-                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin";
+                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin";
 
                         public static String groupId =
-                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/groupId";
+                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/groupId";
 
                         public static String artifactId =
-                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/artifactId";
+                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/artifactId";
 
                         public static String version =
-                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/version";
+                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/version";
 
                         public static String inherited =
-                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/inherited";
+                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/inherited";
 
                         public static String configuration =
-                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/configuration#set";
+                            "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/configuration#set";
 
                         public static class ReportSets
                         {
                             public static String xUri =
-                                "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection";
+                                "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection";
 
                             public static class ReportSet
                             {
                                 public static String xUri =
-                                    "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet";
+                                    "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet";
 
                                 public static String id =
-                                    "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/id";
+                                    "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/id";
 
                                 public static String configuration =
-                                    "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/configuration#set";
+                                    "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/configuration#set";
 
                                 public static String inherited =
-                                    "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/inherited";
+                                    "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/inherited";
 
                                 public static String reports =
-                                    "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/reports";
+                                    "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/reports";
                             }
                         }
                     }
@@ -1375,7 +1375,7 @@ public class ProjectUri
                     "http://apache.org/maven/project/profiles#collection/profile/distributionManagement/status";
             }
 
-            public static String properties = "http://apache.org/maven/project/profiles#collection/profile/properties";
+            public static String properties = "http://apache.org/maven/project/profiles#collection/profile/properties#collection";
         }
     }
 
diff --git a/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java b/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
index 7d9261e16a..ac70323be5 100644
--- a/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
+++ b/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
@@ -307,9 +307,17 @@ public final class PomClassicDomainModel
             s.add(ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.configuration);
             s.add(ProjectUri.Build.Plugins.Plugin.Executions.Execution.configuration);
             //TODO: More profile info
+            s.add(ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.Plugin.Executions.xUri);
+            s.add(ProjectUri.Profiles.Profile.DependencyManagement.Dependencies.Dependency.Exclusions.xUri);
+            s.add(ProjectUri.Profiles.Profile.Dependencies.Dependency.Exclusions.xUri);
+            s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.xUri);
+            s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.Execution.Goals.xURI);
+            s.add(ProjectUri.Profiles.Profile.Reporting.Plugins.Plugin.ReportSets.xUri);
+            s.add(ProjectUri.Profiles.Profile.Reporting.Plugins.Plugin.ReportSets.ReportSet.configuration);
+            s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.Execution.configuration);
+
             s.add(ProjectUri.Profiles.Profile.modules);
             s.add(ProjectUri.Profiles.Profile.Dependencies.xUri);
-            s.add(ProjectUri.Profiles.Profile.Dependencies.Dependency.Exclusions.xUri);
             s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.configuration);
             
             modelProperties = ModelMarshaller.marshallXmlToModelProperties(