diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..6d826dcd1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+# To list all file extensions:
+# git ls-files | awk -F . {'print $NF'}|sort -u
+#
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# files that are binary
+*.png
+*.jpg
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ba26e1aa1..f6b59f9af 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,6 +3,18 @@ on:
     tags:
     - "v*"
   workflow_dispatch:
+    inputs:
+      release:
+        description: 'Delpoy release?'
+        type: boolean
+        default: false
+      website:
+        description: 'Deploy website?'
+        type: boolean
+        default: false
+      pages-branch:
+        description: 'Pages branch name'
+        default: nist-pages
 name: Deploy Tagged Release
 jobs:
   deploy-to-nexus:
@@ -38,6 +50,7 @@ jobs:
     # Maven Deploy
     # -------------------------
     - name: Deploy Maven Artifacts
+      if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && contains('true', github.event.inputs.release))
       run: |
         mvn -B -e -Pgpg -Prelease -Preporting deploy
         # mvn -Pgpg -Prelease nexus-staging:close -DstagingDescription="closing to release"
@@ -46,6 +59,7 @@ jobs:
         MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
     - name: Create release
+      if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && contains('true', github.event.inputs.release))
       uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564
       with:
         draft: true
@@ -57,9 +71,14 @@ jobs:
     # Maven Site
     # -------------------------
     - name: Build Website
+      if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && contains('true', github.event.inputs.website))
       run: |
         mvn -B -e -Prelease -Preporting install site site:stage
-    - name: Run Website Deploy Script
-      run: |
-        touch target/staging/.nojekyll
-        bash .github/workflows/deploy.sh --push-only -v -m "Deploying website [ci skip]"
+    - name: Website Deploy
+      uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847
+      if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && contains('true', github.event.inputs.website))
+      with:
+        personal_token: ${{ secrets.COMMIT_TOKEN }}
+        publish_dir: ./target/staging
+        external_repository: ${{ github.repository }}
+        publish_branch: ${{ (github.event_name == 'workflow_dispatch' && github.event.inputs.pages-branch) || 'nist-pages' }}
diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/AbstractExitStatus.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/AbstractExitStatus.java
index 46d0fd85c..c099e2c69 100644
--- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/AbstractExitStatus.java
+++ b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/AbstractExitStatus.java
@@ -106,10 +106,10 @@ public void generateMessage(boolean showStackTrace) {
 
       if (message != null && !message.isEmpty()) {
         logBuilder.log(message);
-      } else if (throwable != null && showStackTrace) {
+      } else if (showStackTrace && throwable != null) {
         // log the throwable
         logBuilder.log();
-      }
+      } // otherwise there is nothing to log
     }
   }
 
diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java
index 44a921fdd..042c260e0 100644
--- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java
+++ b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java
@@ -66,6 +66,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class CLIProcessor {
   private static final Logger LOGGER = LogManager.getLogger(CLIProcessor.class);
@@ -109,12 +110,14 @@ public class CLIProcessor {
       SHOW_STACK_TRACE_OPTION,
       VERSION_OPTION);
 
+  public static final String COMMAND_VERSION = "http://csrc.nist.gov/ns/metaschema-java/cli/command-version";
+
   @NonNull
   private final List<ICommand> commands = new LinkedList<>();
   @NonNull
   private final String exec;
   @NonNull
-  private final List<IVersionInfo> versionInfos;
+  private final Map<String, IVersionInfo> versionInfos;
 
   public static void main(String... args) {
     System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
@@ -129,10 +132,10 @@ public static void main(String... args) {
 
   @SuppressWarnings("null")
   public CLIProcessor(@NonNull String exec) {
-    this(exec, List.of());
+    this(exec, Map.of());
   }
 
-  public CLIProcessor(@NonNull String exec, @NonNull List<IVersionInfo> versionInfos) {
+  public CLIProcessor(@NonNull String exec, @NonNull Map<String, IVersionInfo> versionInfos) {
     this.exec = exec;
     this.versionInfos = versionInfos;
     AnsiConsole.systemInstall();
@@ -154,7 +157,7 @@ public String getExec() {
    * @return the versionInfo
    */
   @NonNull
-  public List<IVersionInfo> getVersionInfos() {
+  public Map<String, IVersionInfo> getVersionInfos() {
     return versionInfos;
   }
 
@@ -195,7 +198,7 @@ private ExitStatus parseCommand(String... args) {
     return status;
   }
 
-  protected List<ICommand> getTopLevelCommands() {
+  protected final List<ICommand> getTopLevelCommands() {
     List<ICommand> retval = Collections.unmodifiableList(commands);
     assert retval != null;
     return retval;
@@ -206,7 +209,6 @@ private static void handleNoColor() {
     AnsiConsole.systemUninstall();
   }
 
-  @SuppressWarnings("resource")
   public static void handleQuiet() {
     LoggerContext ctx = (LoggerContext) LogManager.getContext(false); // NOPMD not closable here
     Configuration config = ctx.getConfiguration();
@@ -220,7 +222,7 @@ public static void handleQuiet() {
 
   protected void showVersion() {
     @SuppressWarnings("resource") PrintStream out = AnsiConsole.out(); // NOPMD - not owner
-    getVersionInfos().stream().forEach((info) -> {
+    getVersionInfos().values().stream().forEach(info -> {
       out.println(ansi()
           .bold().a(info.getName()).boldOff()
           .a(" ")
@@ -253,6 +255,7 @@ public class CallingContext {
     @NonNull
     private final List<String> extraArgs;
 
+    @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
     public CallingContext(@NonNull List<String> args) {
       Map<String, ICommand> topLevelCommandMap = getTopLevelCommands().stream()
           .collect(Collectors.toUnmodifiableMap(ICommand::getName, Function.identity()));
@@ -263,35 +266,31 @@ public CallingContext(@NonNull List<String> args) {
 
       boolean endArgs = false;
       for (String arg : args) {
-        if (endArgs) {
+        if (endArgs || arg.startsWith("-")) {
           extraArgs.add(arg);
+        } else if ("--".equals(arg)) {
+          endArgs = true;
         } else {
-          if (arg.startsWith("-")) {
+          ICommand command;
+          if (calledCommands.isEmpty()) {
+            command = topLevelCommandMap.get(arg);
+          } else {
+            command = calledCommands.getLast();
+            command = command.getSubCommandByName(arg);
+          }
+
+          if (command == null) {
             extraArgs.add(arg);
-          } else if ("--".equals(arg)) {
             endArgs = true;
           } else {
-            ICommand command;
-            if (calledCommands.isEmpty()) {
-              command = topLevelCommandMap.get(arg);
-            } else {
-              command = calledCommands.getLast();
-              command = command.getSubCommandByName(arg);
-            }
-
-            if (command == null) {
-              extraArgs.add(arg);
-              endArgs = true;
-            } else {
-              calledCommands.add(command);
-            }
+            calledCommands.add(command);
           }
         }
       }
 
       if (LOGGER.isDebugEnabled()) {
         String commandChain = calledCommands.stream()
-            .map(command -> command.getName())
+            .map(ICommand::getName)
             .collect(Collectors.joining(" -> "));
         LOGGER.debug("Processing command chain: {}", commandChain);
       }
@@ -311,6 +310,11 @@ public CallingContext(@NonNull List<String> args) {
       this.extraArgs = extraArgs;
     }
 
+    @NonNull
+    public CLIProcessor getCLIProcessor() {
+      return CLIProcessor.this;
+    }
+
     @Nullable
     public ICommand getTargetCommand() {
       return calledCommands.peekLast();
@@ -546,7 +550,7 @@ protected String buildHelpCliSyntax() {
 
       // output required options
       getOptionsList().stream()
-          .filter(option -> option.isRequired())
+          .filter(Option::isRequired)
           .forEach(option -> {
             builder
                 .append(' ')
diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractParentCommand.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractParentCommand.java
index dc3f72b9a..0416006e3 100644
--- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractParentCommand.java
+++ b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractParentCommand.java
@@ -51,7 +51,7 @@ protected AbstractParentCommand(boolean subCommandRequired) {
     this.subCommandRequired = subCommandRequired;
   }
 
-  protected void addCommandHandler(ICommand handler) {
+  protected final void addCommandHandler(ICommand handler) {
     String commandName = handler.getName();
     this.commandToSubcommandHandlerMap.put(commandName, handler);
   }
@@ -87,7 +87,7 @@ protected ExitStatus executeCommand(
       status = ExitCode.INVALID_COMMAND
           .exitMessage("Please use one of the following sub-commands: " +
               getSubCommands().stream()
-                  .map(command -> command.getName())
+                  .map(ICommand::getName)
                   .collect(Collectors.joining(", ")));
     } else {
       status = ExitCode.OK.exit();
diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/DefaultExtraArgument.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/DefaultExtraArgument.java
index d98b79211..591ed48f1 100644
--- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/DefaultExtraArgument.java
+++ b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/DefaultExtraArgument.java
@@ -26,15 +26,19 @@
 
 package gov.nist.secauto.metaschema.cli.processor.command;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 public class DefaultExtraArgument implements ExtraArgument {
   private final String name;
   private final boolean required;
   private final int number;
 
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public DefaultExtraArgument(String name, boolean required) {
     this(name, required, 1);
   }
 
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public DefaultExtraArgument(String name, boolean required, int number) {
     if (number < 1) {
       throw new IllegalArgumentException("number must be a positive value");
diff --git a/cli-processor/src/main/resources/log4j2.xml b/cli-processor/src/main/resources/log4j2.xml
index b174b3f80..758bf2a4c 100644
--- a/cli-processor/src/main/resources/log4j2.xml
+++ b/cli-processor/src/main/resources/log4j2.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE Configuration>
 <Configuration verbose="true">
 	<Appenders>
-		<Console name="console-trace" target="SYSTEM_ERR" immediateFlush="true">
+		<Console name="console-trace" target="SYSTEM_OUT" immediateFlush="true">
 			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n" charset="UTF-8" />
 			<ThresholdFilter level="INFO" onMatch="DENY" onMismatch="ACCEPT" />
 		</Console>
-		<Console name="console-info" target="SYSTEM_ERR" immediateFlush="true">
+		<Console name="console-info" target="SYSTEM_OUT" immediateFlush="true">
 			<PatternLayout pattern="%m%n" charset="UTF-8" />
 			<Filters>
 				<ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="ACCEPT" />
diff --git a/core/metaschema b/core/metaschema
index 16919d512..088bda7f6 160000
--- a/core/metaschema
+++ b/core/metaschema
@@ -1 +1 @@
-Subproject commit 16919d512f96110c49fa2edcd3e6ee9a377c0b69
+Subproject commit 088bda7f6fbad8ad0132f8fdb30b3d81c7b578ab
diff --git a/core/pom.xml b/core/pom.xml
index 6e8baf269..e4fabc367 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -169,9 +169,10 @@
                     <artifactId>jacoco-maven-plugin</artifactId>
                     <configuration>
                         <excludes>
-                            <exclude>
-                                gov/nist/secauto/metaschema/core/model/xml/xmlbeans/**/*</exclude>
+							<!-- filter generated code -->
+                            <exclude>gov/nist/secauto/metaschema/core/model/xml/xmlbeans/**/*</exclude>
                             <exclude>org/apache/xmlbeans/**/*</exclude>
+                            <exclude>gov/nist/secauto/metaschema/core/metapath/antlr/*</exclude>
                         </excludes>
                     </configuration>
                 </plugin>
diff --git a/core/src/main/antlr4/Metapath10.g4 b/core/src/main/antlr4/Metapath10.g4
index 77e81a4b0..0fb07f3ca 100644
--- a/core/src/main/antlr4/Metapath10.g4
+++ b/core/src/main/antlr4/Metapath10.g4
@@ -4,16 +4,13 @@ parser grammar Metapath10;
 
 options { tokenVocab=Metapath10Lexer; superClass=Metapath10ParserBase; }
 
-// Metapath extensions
-metapath : expr EOF ;
-
 // [1]
-// xpath : expr EOF ;
+metapath : expr EOF ;
 // paramlist : param ( COMMA param)* ;
 // param : DOLLAR eqname typedeclaration? ;
 // functionbody : enclosedexpr ;
 // [5]
-// enclosedexpr : OC expr? CC ;
+enclosedexpr : OC expr? CC ;
 expr : exprsingle ( COMMA exprsingle)* ;
 exprsingle : forexpr | letexpr | quantifiedexpr  | ifexpr | orexpr ;
 forexpr : simpleforclause KW_RETURN exprsingle ;
@@ -57,14 +54,11 @@ relativepathexpr : stepexpr (( SLASH | SS) stepexpr)* ;
 stepexpr : postfixexpr | axisstep ;
 axisstep : (reversestep | forwardstep) predicatelist ;
 // [40]
-// forwardstep : forwardaxis nodetest | abbrevforwardstep ;
-forwardstep : forwardaxis nametest | abbrevforwardstep ;
+forwardstep : forwardaxis nodetest | abbrevforwardstep ;
 // forwardaxis : KW_CHILD COLONCOLON | KW_DESCENDANT COLONCOLON | KW_ATTRIBUTE COLONCOLON | KW_SELF COLONCOLON | KW_DESCENDANT_OR_SELF COLONCOLON | KW_FOLLOWING_SIBLING COLONCOLON | KW_FOLLOWING COLONCOLON | KW_NAMESPACE COLONCOLON ;
 forwardaxis : KW_CHILD COLONCOLON | KW_DESCENDANT COLONCOLON | KW_SELF COLONCOLON | KW_DESCENDANT_OR_SELF COLONCOLON ;
-// abbrevforwardstep : AT? nodetest ;
-abbrevforwardstep : AT? nametest ;
-// reversestep : reverseaxis nodetest | abbrevreversestep ;
-reversestep : reverseaxis nametest | abbrevreversestep ;
+abbrevforwardstep : AT? nodetest ;
+reversestep : reverseaxis nodetest | abbrevreversestep ;
 // reverseaxis : KW_PARENT COLONCOLON | KW_ANCESTOR COLONCOLON | KW_PRECEDING_SIBLING COLONCOLON | KW_PRECEDING COLONCOLON | KW_ANCESTOR_OR_SELF COLONCOLON ;
 reverseaxis : KW_PARENT COLONCOLON | KW_ANCESTOR COLONCOLON | KW_ANCESTOR_OR_SELF COLONCOLON ;
 // [45]
@@ -73,19 +67,18 @@ abbrevreversestep : DD ;
 nodetest : nametest ;
 nametest : eqname | wildcard ;
 wildcard : STAR | NCName CS | SC NCName | BracedURILiteral STAR ;
-// postfixexpr : primaryexpr (predicate | argumentlist | lookup)* ;
-postfixexpr : primaryexpr (predicate)* ;
+postfixexpr : primaryexpr (predicate | argumentlist | lookup)* ;
 // [50]
 argumentlist : OP (argument ( COMMA argument)*)? CP ;
 predicatelist : predicate* ;
 predicate : OB expr CB ;
-// lookup : QM keyspecifier ;
-// keyspecifier : NCName | IntegerLiteral | parenthesizedexpr | STAR ;
+lookup : QM keyspecifier ;
+keyspecifier : NCName | IntegerLiteral | parenthesizedexpr | STAR ;
 // [55]
 //arrowfunctionspecifier : eqname | varref | parenthesizedexpr ;
 arrowfunctionspecifier : eqname;
 // primaryexpr : literal | varref | parenthesizedexpr | contextitemexpr | functioncall | functionitemexpr | mapconstructor | arrayconstructor | unarylookup ;
-primaryexpr : literal | varref | parenthesizedexpr | contextitemexpr | functioncall ;
+primaryexpr : literal | varref | parenthesizedexpr | contextitemexpr | functioncall | mapconstructor | arrayconstructor | unarylookup;
 literal : numericliteral | StringLiteral ;
 numericliteral : IntegerLiteral | DecimalLiteral | DoubleLiteral ;
 varref : DOLLAR varname ;
@@ -101,16 +94,16 @@ argument : exprsingle ;
 // functionitemexpr : namedfunctionref | inlinefunctionexpr ;
 // namedfunctionref : eqname POUND IntegerLiteral /* xgc: reserved-function-names */;
 // inlinefunctionexpr : KW_FUNCTION OP paramlist? CP ( KW_AS sequencetype)? functionbody ;
-// mapconstructor : KW_MAP OC (mapconstructorentry ( COMMA mapconstructorentry)*)? CC ;
+mapconstructor : KW_MAP OC (mapconstructorentry ( COMMA mapconstructorentry)*)? CC ;
 // [70]
-// mapconstructorentry : mapkeyexpr COLON mapvalueexpr ;
-// mapkeyexpr : exprsingle ;
-// mapvalueexpr : exprsingle ;
-// arrayconstructor : squarearrayconstructor | curlyarrayconstructor ;
-// squarearrayconstructor : OB (exprsingle ( COMMA exprsingle)*)? CB ;
+mapconstructorentry : mapkeyexpr COLON mapvalueexpr ;
+mapkeyexpr : exprsingle ;
+mapvalueexpr : exprsingle ;
+arrayconstructor : squarearrayconstructor | curlyarrayconstructor ;
+squarearrayconstructor : OB (exprsingle ( COMMA exprsingle)*)? CB ;
 // [75]
-// curlyarrayconstructor : KW_ARRAY enclosedexpr ;
-// unarylookup : QM keyspecifier ;
+curlyarrayconstructor : KW_ARRAY enclosedexpr ;
+unarylookup : QM keyspecifier ;
 // singletype : simpletypename QM? ;
 // typedeclaration : KW_AS sequencetype ;
 // sequencetype : KW_EMPTY_SEQUENCE OP CP | itemtype occurrenceindicator? ;
@@ -156,7 +149,7 @@ argument : exprsingle ;
 
 
 // Error in the spec. EQName also includes acceptable keywords.
-eqname : QName | URIQualifiedName
+eqname : NCName | QName | URIQualifiedName
  | KW_ANCESTOR
  | KW_ANCESTOR_OR_SELF
  | KW_AND
diff --git a/core/src/main/antlr4/Metapath10Lexer.g4 b/core/src/main/antlr4/Metapath10Lexer.g4
index f95456ef4..21c735e2f 100644
--- a/core/src/main/antlr4/Metapath10Lexer.g4
+++ b/core/src/main/antlr4/Metapath10Lexer.g4
@@ -1,166 +1,180 @@
 // This grammar is derived from the XPath 3.1 grammar produced by Ken Domino, et al (https://github.com/antlr/grammars-v4/blob/63359bd91593ece31a384acd507ae860d6cf7ff7/xpath/xpath31/XPath31Lexer.g4).
 
+// This is a faithful implementation of the XPath version 3.1 grammar
+// from the spec at https://www.w3.org/TR/2017/REC-xpath-31-20170321/
+
+// $antlr-format alignTrailingComments true, columnLimit 150, maxEmptyLinesToKeep 1, reflowComments false, useTab false
+// $antlr-format allowShortRulesOnASingleLine true, allowShortBlocksOnASingleLine true, minEmptyLines 0, alignSemicolons ownLine
+// $antlr-format alignColons trailing, singleLineOverrulesHangingColon true, alignLexerCommands true, alignLabels true, alignTrailers true
+
 lexer grammar Metapath10Lexer;
 
-AT : '@' ;
-BANG : '!' ;
-CB : ']' ;
-CC : '}' ;
-CEQ : ':=' ;
-COLON : ':' ;
-COLONCOLON : '::' ;
-COMMA : ',' ;
-CP : ')' ;
-CS : ':*' ;
-D : '.' ;
-DD : '..' ;
-DOLLAR : '$' ;
-EG : '=>' ;
-EQ : '=' ;
-GE : '>=' ;
-GG : '>>' ;
-GT : '>' ;
-LE : '<=' ;
-LL : '<<' ;
-LT : '<' ;
-MINUS : '-' ;
-NE : '!=' ;
-OB : '[' ;
-OC : '{' ;
-OP : '(' ;
-P : '|' ;
-PLUS : '+' ;
-POUND : '#' ;
-PP : '||' ;
-QM : '?' ;
-SC : '*:' ;
-SLASH : '/' ;
-SS : '//' ;
-STAR : '*' ;
+AT         : '@';
+BANG       : '!';
+CB         : ']';
+CC         : '}';
+CEQ        : ':=';
+COLON      : ':';
+COLONCOLON : '::';
+COMMA      : ',';
+CP         : ')';
+CS         : ':*';
+D          : '.';
+DD         : '..';
+DOLLAR     : '$';
+EG         : '=>';
+EQ         : '=';
+GE         : '>=';
+GG         : '>>';
+GT         : '>';
+LE         : '<=';
+LL         : '<<';
+LT         : '<';
+MINUS      : '-';
+NE         : '!=';
+OB         : '[';
+OC         : '{';
+OP         : '(';
+P          : '|';
+PLUS       : '+';
+POUND      : '#';
+PP         : '||';
+QM         : '?';
+SC         : '*:';
+SLASH      : '/';
+SS         : '//';
+STAR       : '*';
 
 // KEYWORDS
 
-KW_ANCESTOR : 'ancestor' ;
-KW_ANCESTOR_OR_SELF : 'ancestor-or-self' ;
-KW_AND : 'and' ;
-KW_ARRAY : 'array' ;
-KW_AS : 'as' ;
-KW_ATTRIBUTE : 'attribute' ;
-KW_CAST : 'cast' ;
-KW_CASTABLE : 'castable' ;
-KW_CHILD : 'child' ;
-KW_COMMENT : 'comment' ;
-KW_DESCENDANT : 'descendant' ;
-KW_DESCENDANT_OR_SELF : 'descendant-or-self' ;
-KW_DIV : 'div' ;
-KW_DOCUMENT_NODE : 'document-node' ;
-KW_ELEMENT : 'element' ;
-KW_ELSE : 'else' ;
-KW_EMPTY_SEQUENCE : 'empty-sequence' ;
-KW_EQ : 'eq' ;
-KW_EVERY : 'every' ;
-KW_EXCEPT : 'except' ;
-KW_FOLLOWING : 'following' ;
-KW_FOLLOWING_SIBLING : 'following-sibling' ;
-KW_FOR : 'for' ;
-KW_FUNCTION : 'function' ;
-KW_GE : 'ge' ;
-KW_GT : 'gt' ;
-KW_IDIV : 'idiv' ;
-KW_IF : 'if' ;
-KW_IN : 'in' ;
-KW_INSTANCE : 'instance' ;
-KW_INTERSECT : 'intersect' ;
-KW_IS : 'is' ;
-KW_ITEM : 'item' ;
-KW_LE : 'le' ;
-KW_LET : 'let' ;
-KW_LT : 'lt' ;
-KW_MAP : 'map' ;
-KW_MOD : 'mod' ;
-KW_NAMESPACE : 'namespace' ;
-KW_NAMESPACE_NODE : 'namespace-node' ;
-KW_NE : 'ne' ;
-KW_NODE : 'node' ;
-KW_OF : 'of' ;
-KW_OR : 'or' ;
-KW_PARENT : 'parent' ;
-KW_PRECEDING : 'preceding' ;
-KW_PRECEDING_SIBLING : 'preceding-sibling' ;
-KW_PROCESSING_INSTRUCTION : 'processing-instruction' ;
-KW_RETURN : 'return' ;
-KW_SATISFIES : 'satisfies' ;
-KW_SCHEMA_ATTRIBUTE : 'schema-attribute' ;
-KW_SCHEMA_ELEMENT : 'schema-element' ;
-KW_SELF : 'self' ;
-KW_SOME : 'some' ;
-KW_TEXT : 'text' ;
-KW_THEN : 'then' ;
-KW_TO : 'to' ;
-KW_TREAT : 'treat' ;
-KW_UNION : 'union' ;
+KW_ANCESTOR               : 'ancestor';
+KW_ANCESTOR_OR_SELF       : 'ancestor-or-self';
+KW_AND                    : 'and';
+KW_ARRAY                  : 'array';
+KW_AS                     : 'as';
+KW_ATTRIBUTE              : 'attribute';
+KW_CAST                   : 'cast';
+KW_CASTABLE               : 'castable';
+KW_CHILD                  : 'child';
+KW_COMMENT                : 'comment';
+KW_DESCENDANT             : 'descendant';
+KW_DESCENDANT_OR_SELF     : 'descendant-or-self';
+KW_DIV                    : 'div';
+KW_DOCUMENT_NODE          : 'document-node';
+KW_ELEMENT                : 'element';
+KW_ELSE                   : 'else';
+KW_EMPTY_SEQUENCE         : 'empty-sequence';
+KW_EQ                     : 'eq';
+KW_EVERY                  : 'every';
+KW_EXCEPT                 : 'except';
+KW_FOLLOWING              : 'following';
+KW_FOLLOWING_SIBLING      : 'following-sibling';
+KW_FOR                    : 'for';
+KW_FUNCTION               : 'function';
+KW_GE                     : 'ge';
+KW_GT                     : 'gt';
+KW_IDIV                   : 'idiv';
+KW_IF                     : 'if';
+KW_IN                     : 'in';
+KW_INSTANCE               : 'instance';
+KW_INTERSECT              : 'intersect';
+KW_IS                     : 'is';
+KW_ITEM                   : 'item';
+KW_LE                     : 'le';
+KW_LET                    : 'let';
+KW_LT                     : 'lt';
+KW_MAP                    : 'map';
+KW_MOD                    : 'mod';
+KW_NAMESPACE              : 'namespace';
+KW_NAMESPACE_NODE         : 'namespace-node';
+KW_NE                     : 'ne';
+KW_NODE                   : 'node';
+KW_OF                     : 'of';
+KW_OR                     : 'or';
+KW_PARENT                 : 'parent';
+KW_PRECEDING              : 'preceding';
+KW_PRECEDING_SIBLING      : 'preceding-sibling';
+KW_PROCESSING_INSTRUCTION : 'processing-instruction';
+KW_RETURN                 : 'return';
+KW_SATISFIES              : 'satisfies';
+KW_SCHEMA_ATTRIBUTE       : 'schema-attribute';
+KW_SCHEMA_ELEMENT         : 'schema-element';
+KW_SELF                   : 'self';
+KW_SOME                   : 'some';
+KW_TEXT                   : 'text';
+KW_THEN                   : 'then';
+KW_TO                     : 'to';
+KW_TREAT                  : 'treat';
+KW_UNION                  : 'union';
 
 // A.2.1. TERMINAL SYMBOLS
 // This isn't a complete list of tokens in the language.
 // Keywords and symbols are terminals.
 
-IntegerLiteral : FragDigits ;
-DecimalLiteral : '.' FragDigits | FragDigits '.' [0-9]* ;
-DoubleLiteral : ('.' FragDigits | FragDigits ('.' [0-9]*)?) [eE] [+-]? FragDigits ;
-StringLiteral : '"' (~["] | FragEscapeQuot)* '"' | '\'' (~['] | FragEscapeApos)* '\'' ;
-URIQualifiedName : BracedURILiteral NCName ;
-BracedURILiteral : 'Q' '{' [^{}]* '}' ;
+IntegerLiteral   : FragDigits;
+DecimalLiteral   : '.' FragDigits | FragDigits '.' [0-9]*;
+DoubleLiteral    : ('.' FragDigits | FragDigits ('.' [0-9]*)?) [eE] [+-]? FragDigits;
+StringLiteral    : '"' (~["] | FragEscapeQuot)* '"' | '\'' (~['] | FragEscapeApos)* '\'';
+URIQualifiedName : BracedURILiteral NCName;
+BracedURILiteral : 'Q' '{' [^{}]* '}';
 // Error in spec: EscapeQuot and EscapeApos are not terminals!
-fragment FragEscapeQuot : '""' ; 
+fragment FragEscapeQuot : '""';
 fragment FragEscapeApos : '\'\'';
 // Error in spec: Comment isn't really a terminal, but an off-channel object.
-Comment : '(:' (Comment | CommentContents)*? ':)' -> skip ;
-QName  : FragQName ;
-NCName : FragmentNCName ;
+Comment : '(:' (Comment | CommentContents)*? ':)' -> skip;
+NCName  : FragmentNCName;
+QName   : FragQName;
 // Error in spec: Char is not a terminal!
-fragment Char : FragChar ;
-fragment FragDigits : [0-9]+ ;
-fragment CommentContents : Char ;
+fragment Char            : FragChar;
+fragment FragDigits      : [0-9]+;
+fragment CommentContents : Char;
 // https://www.w3.org/TR/REC-xml-names/#NT-QName
-fragment FragQName : FragPrefixedName | FragUnprefixedName ;
-fragment FragPrefixedName : FragPrefix ':' FragLocalPart ;
-fragment FragUnprefixedName : FragLocalPart ;
-fragment FragPrefix : FragmentNCName ;
-fragment FragLocalPart : FragmentNCName ;
-fragment FragNCNameStartChar
-  :  'A'..'Z'
-  |  '_'
-  | 'a'..'z'
-  | '\u00C0'..'\u00D6'
-  | '\u00D8'..'\u00F6'
-  | '\u00F8'..'\u02FF'
-  | '\u0370'..'\u037D'
-  | '\u037F'..'\u1FFF'
-  | '\u200C'..'\u200D'
-  | '\u2070'..'\u218F'
-  | '\u2C00'..'\u2FEF'
-  | '\u3001'..'\uD7FF'
-  | '\uF900'..'\uFDCF'
-  | '\uFDF0'..'\uFFFD'
-  | '\u{10000}'..'\u{EFFFF}'
-  ;
-fragment FragNCNameChar
-  :  FragNCNameStartChar | '-' | '.' | '0'..'9'
-  |  '\u00B7' | '\u0300'..'\u036F'
-  |  '\u203F'..'\u2040'
-  ;
-fragment FragmentNCName  :  FragNCNameStartChar FragNCNameChar*  ;
+fragment FragQName          : FragPrefixedName | FragUnprefixedName;
+fragment FragPrefixedName   : FragPrefix ':' FragLocalPart;
+fragment FragUnprefixedName : FragLocalPart;
+fragment FragPrefix         : FragmentNCName;
+fragment FragLocalPart      : FragmentNCName;
+fragment FragNCNameStartChar:
+    'A' ..'Z'
+    | '_'
+    | 'a' ..'z'
+    | '\u00C0' ..'\u00D6'
+    | '\u00D8' ..'\u00F6'
+    | '\u00F8' ..'\u02FF'
+    | '\u0370' ..'\u037D'
+    | '\u037F' ..'\u1FFF'
+    | '\u200C' ..'\u200D'
+    | '\u2070' ..'\u218F'
+    | '\u2C00' ..'\u2FEF'
+    | '\u3001' ..'\uD7FF'
+    | '\uF900' ..'\uFDCF'
+    | '\uFDF0' ..'\uFFFD'
+    | '\u{10000}' ..'\u{EFFFF}'
+;
+fragment FragNCNameChar:
+    FragNCNameStartChar
+    | '-'
+    | '.'
+    | '0' ..'9'
+    | '\u00B7'
+    | '\u0300' ..'\u036F'
+    | '\u203F' ..'\u2040'
+;
+fragment FragmentNCName: FragNCNameStartChar FragNCNameChar*;
 
 // https://www.w3.org/TR/REC-xml/#NT-Char
 
-fragment FragChar : '\u0009' | '\u000a' | '\u000d'
-  | '\u0020'..'\ud7ff'
-  | '\ue000'..'\ufffd'
-  | '\u{10000}'..'\u{10ffff}'
- ;
+fragment FragChar:
+    '\u0009'
+    | '\u000a'
+    | '\u000d'
+    | '\u0020' ..'\ud7ff'
+    | '\ue000' ..'\ufffd'
+    | '\u{10000}' ..'\u{10ffff}'
+;
 
 // https://github.com/antlr/grammars-v4/blob/17d3db3fd6a8fc319a12176e0bb735b066ec0616/xpath/xpath31/XPath31.g4#L389
-Whitespace :  ('\u000d' | '\u000a' | '\u0020' | '\u0009')+ -> skip ;
+Whitespace: ('\u000d' | '\u000a' | '\u0020' | '\u0009')+ -> skip;
 
 // Not per spec. Specified for testing.
-SEMI : ';' ;
+SEMI: ';';
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataType.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataType.java
index e5ad1b43a..d42b85329 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataType.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataType.java
@@ -1,87 +1,87 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype;
-
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.util.Objects;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-/**
- * A common base implementation of a custom Java object providing an underlying
- * implementation of a data type.
- *
- * @param <TYPE>
- *          the bound object type supported by this data type
- * @param <VALUE>
- *          the inner value of the data type object
- */
-public abstract class AbstractCustomJavaDataType<TYPE extends ICustomJavaDataType<TYPE>, VALUE>
-    implements ICustomJavaDataType<TYPE> {
-  @NonNull
-  private final VALUE value;
-
-  /**
-   * Construct a new instance of a custom Java object-based data value.
-   *
-   * @param value
-   *          the bound object that the data type is based on
-   */
-  protected AbstractCustomJavaDataType(@NonNull VALUE value) {
-    this.value = ObjectUtils.requireNonNull(value, "value");
-  }
-
-  /**
-   * Get the bound Java object value.
-   *
-   * @return the bound object
-   */
-  @NonNull
-  public VALUE getValue() {
-    return value;
-  }
-  //
-  // public void setValue(T value) {
-  // this.value = value;
-  // }
-
-  @Override
-  public int hashCode() {
-    return value.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return Objects.equals(value, obj);
-  }
-
-  @Override
-  public String toString() {
-    return value.toString();
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype;
+
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.Objects;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A common base implementation of a custom Java object providing an underlying
+ * implementation of a data type.
+ *
+ * @param <TYPE>
+ *          the bound object type supported by this data type
+ * @param <VALUE>
+ *          the inner value of the data type object
+ */
+public abstract class AbstractCustomJavaDataType<TYPE extends ICustomJavaDataType<TYPE>, VALUE>
+    implements ICustomJavaDataType<TYPE> {
+  @NonNull
+  private final VALUE value;
+
+  /**
+   * Construct a new instance of a custom Java object-based data value.
+   *
+   * @param value
+   *          the bound object that the data type is based on
+   */
+  protected AbstractCustomJavaDataType(@NonNull VALUE value) {
+    this.value = ObjectUtils.requireNonNull(value, "value");
+  }
+
+  /**
+   * Get the bound Java object value.
+   *
+   * @return the bound object
+   */
+  @NonNull
+  public VALUE getValue() {
+    return value;
+  }
+  //
+  // public void setValue(T value) {
+  // this.value = value;
+  // }
+
+  @Override
+  public int hashCode() {
+    return value.hashCode();
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return Objects.equals(value, obj);
+  }
+
+  @Override
+  public String toString() {
+    return value.toString();
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java
index 9cad33bc4..8908f6d36 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java
@@ -1,68 +1,68 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype;
-
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-/**
- * Provides a Java type adapter implementation for data types that are based on
- * {@link ICustomJavaDataType}.
- *
- * @param <TYPE>
- *          the Java type this adapter supports, which is based on
- *          {@link ICustomJavaDataType}
- * @param <ITEM_TYPE>
- *          the Metapath item type associated with the adapter
- */
-public abstract class AbstractCustomJavaDataTypeAdapter<
-    TYPE extends ICustomJavaDataType<
-        TYPE>,
-    ITEM_TYPE extends IAnyAtomicItem>
-    extends AbstractDataTypeAdapter<TYPE, ITEM_TYPE> {
-
-  /**
-   * Construct a new Java type adapter for the class based on
-   * {@link ICustomJavaDataType}.
-   *
-   * @param clazz
-   *          a data type class based on {@link ICustomJavaDataType}
-   */
-  public AbstractCustomJavaDataTypeAdapter(@NonNull Class<TYPE> clazz) {
-    super(clazz);
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public TYPE copy(Object obj) {
-    // Datatype-based types are required to provide a copy method. Delegate to this
-    // method.
-    return ((TYPE) obj).copy();
-  }
-
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype;
+
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * Provides a Java type adapter implementation for data types that are based on
+ * {@link ICustomJavaDataType}.
+ *
+ * @param <TYPE>
+ *          the Java type this adapter supports, which is based on
+ *          {@link ICustomJavaDataType}
+ * @param <ITEM_TYPE>
+ *          the Metapath item type associated with the adapter
+ */
+public abstract class AbstractCustomJavaDataTypeAdapter<
+    TYPE extends ICustomJavaDataType<
+        TYPE>,
+    ITEM_TYPE extends IAnyAtomicItem>
+    extends AbstractDataTypeAdapter<TYPE, ITEM_TYPE> {
+
+  /**
+   * Construct a new Java type adapter for the class based on
+   * {@link ICustomJavaDataType}.
+   *
+   * @param clazz
+   *          a data type class based on {@link ICustomJavaDataType}
+   */
+  public AbstractCustomJavaDataTypeAdapter(@NonNull Class<TYPE> clazz) {
+    super(clazz);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public TYPE copy(Object obj) {
+    // Datatype-based types are required to provide a copy method. Delegate to this
+    // method.
+    return ((TYPE) obj).copy();
+  }
+
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeProvider.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeProvider.java
index 256bb755a..9fac25c1a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeProvider.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeProvider.java
@@ -61,7 +61,7 @@ public List<? extends IDataTypeAdapter<?>> getJavaTypeAdapters() {
    *           if another type adapter has no name
    */
   protected void registerDatatype(@NonNull IDataTypeAdapter<?> adapter) {
-    if (adapter.getNames().size() == 0) {
+    if (adapter.getNames().isEmpty()) {
       throw new IllegalArgumentException("The adapter has no name: " + adapter.getClass().getName());
     }
     synchronized (this) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/DataTypeService.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/DataTypeService.java
index 84db86536..0c705ad0f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/DataTypeService.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/DataTypeService.java
@@ -39,6 +39,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import nl.talsmasoftware.lazy4j.Lazy;
@@ -51,8 +53,9 @@ public final class DataTypeService {
   private static final Logger LOGGER = LogManager.getLogger(DataTypeService.class);
   private static final Lazy<DataTypeService> INSTANCE = Lazy.lazy(() -> new DataTypeService());
 
-  private Map<String, IDataTypeAdapter<?>> libraryByName;
-  private Map<Class<? extends IDataTypeAdapter<?>>, IDataTypeAdapter<?>> libraryByClass;
+  private final Map<String, IDataTypeAdapter<?>> typeByName;
+  private final Map<QName, IDataTypeAdapter<?>> typeByQName;
+  private final Map<Class<? extends IDataTypeAdapter<?>>, IDataTypeAdapter<?>> typeByClass;
 
   /**
    * Get the singleton service instance, which will be lazy constructed on first
@@ -67,57 +70,36 @@ public static DataTypeService getInstance() {
   }
 
   private DataTypeService() {
-    load();
-  }
-
-  /**
-   * Lookup a specific {@link IDataTypeAdapter} instance by its name.
-   *
-   * @param name
-   *          the data type name of data type adapter to get the instance for
-   * @return the instance or {@code null} if the instance is unknown to the type
-   *         system
-   */
-  @Nullable
-  public IDataTypeAdapter<?> getJavaTypeAdapterByName(@NonNull String name) {
-    return libraryByName.get(name);
-  }
-
-  /**
-   * Lookup a specific {@link IDataTypeAdapter} instance by its class.
-   *
-   * @param clazz
-   *          the adapter class to get the instance for
-   * @param <TYPE>
-   *          the type of the requested adapter
-   * @return the instance or {@code null} if the instance is unknown to the type
-   *         system
-   */
-  @SuppressWarnings("unchecked")
-  @Nullable
-  public <TYPE extends IDataTypeAdapter<?>> TYPE getJavaTypeAdapterByClass(@NonNull Class<TYPE> clazz) {
-    return (TYPE) libraryByClass.get(clazz);
-  }
 
-  /**
-   * Load available data types registered with the {@link IDataTypeProvider} SPI.
-   *
-   * @throws IllegalStateException
-   *           if there are two adapters with the same name
-   */
-  private void load() {
     ServiceLoader<IDataTypeProvider> loader = ServiceLoader.load(IDataTypeProvider.class);
     List<IDataTypeAdapter<?>> dataTypes = loader.stream()
         .map(Provider<IDataTypeProvider>::get)
         .flatMap(provider -> provider.getJavaTypeAdapters().stream())
         .collect(Collectors.toList());
 
-    Map<String, IDataTypeAdapter<?>> libraryByName = dataTypes.stream()
+    Map<String, IDataTypeAdapter<?>> typeByName = dataTypes.stream()
         .flatMap(dataType -> dataType.getNames().stream()
-            .map(name -> Map.entry(name, dataType)))
+            .map(qname -> Map.entry(qname.getLocalPart(), dataType)))
         .collect(CustomCollectors.toMap(
             Map.Entry::getKey,
-            (entry) -> entry.getValue(),
+            Map.Entry::getValue,
+            (key, v1, v2) -> {
+              if (LOGGER.isWarnEnabled()) {
+                LOGGER.warn("Data types '{}' and '{}' have duplicate name '{}'. Using the first.",
+                    v1.getClass().getName(),
+                    v2.getClass().getName(),
+                    key);
+              }
+              return v1;
+            },
+            ConcurrentHashMap::new));
+
+    Map<QName, IDataTypeAdapter<?>> typeByQName = dataTypes.stream()
+        .flatMap(dataType -> dataType.getNames().stream()
+            .map(qname -> Map.entry(qname, dataType)))
+        .collect(CustomCollectors.toMap(
+            Map.Entry::getKey,
+            Map.Entry::getValue,
             (key, v1, v2) -> {
               if (LOGGER.isWarnEnabled()) {
                 LOGGER.warn("Data types '{}' and '{}' have duplicate name '{}'. Using the first.",
@@ -130,7 +112,7 @@ private void load() {
             ConcurrentHashMap::new));
 
     @SuppressWarnings({ "unchecked", "null" }) Map<Class<? extends IDataTypeAdapter<?>>,
-        IDataTypeAdapter<?>> libraryByClass = dataTypes.stream()
+        IDataTypeAdapter<?>> typeByClass = dataTypes.stream()
             .collect(CustomCollectors.toMap(
                 dataType -> (Class<? extends IDataTypeAdapter<?>>) dataType.getClass(),
                 Function.identity(),
@@ -142,10 +124,50 @@ private void load() {
                   return v1;
                 },
                 ConcurrentHashMap::new));
+    this.typeByName = typeByName;
+    this.typeByQName = typeByQName;
+    this.typeByClass = typeByClass;
+  }
+
+  /**
+   * Lookup a specific {@link IDataTypeAdapter} instance by its name.
+   *
+   * @param qname
+   *          the qualified name of data type adapter to get the instance for
+   * @return the instance or {@code null} if the instance is unknown to the type
+   *         system
+   */
+  @Nullable
+  public IDataTypeAdapter<?> getJavaTypeAdapterByQName(@NonNull QName qname) {
+    return typeByQName.get(qname);
+  }
 
-    synchronized (this) {
-      this.libraryByName = libraryByName;
-      this.libraryByClass = libraryByClass;
-    }
+  /**
+   * Lookup a specific {@link IDataTypeAdapter} instance by its name.
+   *
+   * @param name
+   *          the name of data type adapter to get the instance for
+   * @return the instance or {@code null} if the instance is unknown to the type
+   *         system
+   */
+  @Nullable
+  public IDataTypeAdapter<?> getJavaTypeAdapterByName(@NonNull String name) {
+    return typeByName.get(name);
+  }
+
+  /**
+   * Lookup a specific {@link IDataTypeAdapter} instance by its class.
+   *
+   * @param clazz
+   *          the adapter class to get the instance for
+   * @param <TYPE>
+   *          the type of the requested adapter
+   * @return the instance or {@code null} if the instance is unknown to the type
+   *         system
+   */
+  @SuppressWarnings("unchecked")
+  @Nullable
+  public <TYPE extends IDataTypeAdapter<?>> TYPE getJavaTypeAdapterByClass(@NonNull Class<TYPE> clazz) {
+    return (TYPE) typeByClass.get(clazz);
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/IDataTypeAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/IDataTypeAdapter.java
index 826c26f48..18c2f14b8 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/IDataTypeAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/IDataTypeAdapter.java
@@ -1,388 +1,388 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import org.codehaus.stax2.XMLEventReader2;
-import org.codehaus.stax2.XMLStreamWriter2;
-import org.codehaus.stax2.evt.XMLEventFactory2;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.function.Supplier;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.events.StartElement;
-import javax.xml.stream.events.XMLEvent;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public interface IDataTypeAdapter<TYPE> {
-
-  /**
-   * Get the metaschema type names associated with this adapter. This name must be
-   * unique with respect to all other metaschema types.
-   * <p>
-   * At least one name must be provided, with the first name being the most
-   * preferred name.
-   *
-   * @return the name
-   */
-  @NonNull
-  List<String> getNames();
-
-  /**
-   * The JSON primative type of the data type.
-   *
-   * @return the JSON data type
-   */
-  JsonFormatTypes getJsonRawType();
-
-  /**
-   * Get the most preferred name for this data type.
-   *
-   * @return the name
-   */
-  @NonNull
-  default String getPreferredName() {
-    return ObjectUtils.notNull(getNames().iterator().next());
-  }
-
-  /**
-   * Get the Java class supported by this adapter.
-   *
-   * @return the Java class
-   */
-  @NonNull
-  Class<TYPE> getJavaClass();
-
-  /**
-   * Casts the provided value to the type associated with this adapter.
-   *
-   * @param value
-   *          a value of the provided type
-   * @return the typed value
-   */
-  @NonNull
-  TYPE toValue(@NonNull Object value);
-
-  /**
-   * Gets the value as a string suitable for writing as text. This is intended for
-   * data types that have a simple string-based structure in XML and JSON, such as
-   * for XML attributes or JSON keys. An adapter for a complex data structures
-   * that consist of XML elements will throw an
-   * {@link UnsupportedOperationException} when this is called.
-   *
-   * @param value
-   *          the data to formatted as a string
-   * @return a string
-   * @throws UnsupportedOperationException
-   *           if the data type cannot be represented as a string
-   */
-  @NonNull
-  String asString(@NonNull Object value);
-
-  /**
-   * Create a copy of the provided value.
-   *
-   * @param obj
-   *          the value to copy
-   * @return the copy
-   */
-  @NonNull
-  TYPE copy(@NonNull Object obj);
-
-  /**
-   * Determines if the data type is an atomic, scalar value. Complex structures
-   * such as Markup are not considered atomic.
-   *
-   * @return {@code true} if the data type is an atomic scalar value, or
-   *         {@code false} otherwise
-   */
-  default boolean isAtomic() {
-    return true;
-  }
-
-  /**
-   * Get the java type of the associated item.
-   *
-   * @return the java associated item type
-   */
-  @NonNull
-  Class<? extends IAnyAtomicItem> getItemClass();
-
-  /**
-   * Construct a new item of this type using the provided value.
-   *
-   * @param value
-   *          the item's value
-   * @return a new item
-   */
-  // TODO: markup types are not atomic values. Figure out a better base type
-  // (i.e., IValuedItem)
-  @NonNull
-  IAnyAtomicItem newItem(@NonNull Object value);
-
-  /**
-   * Cast the provided item to an item of this type, if possible.
-   *
-   * @param item
-   *          the atomic item to cast
-   * @return an atomic item of this type
-   * @throws InvalidValueForCastFunctionException
-   *           if the provided item type cannot be cast to this item type
-   */
-  @NonNull
-  IAnyAtomicItem cast(IAnyAtomicItem item);
-
-  /**
-   * Indicates if the adapter will parse the {@link XMLEvent#START_ELEMENT} before
-   * parsing the value data.
-   *
-   * @return {@code true} if the adapter requires the start element for parsing,
-   *         or {@code false} otherwise
-   */
-  // TODO; implement or remove this
-  boolean isParsingStartElement();
-
-  /**
-   * Determines if adapter can parse the next element. The next element's
-   * {@link QName} is provided for this purpose.
-   * <p>
-   * This will be called when the parser encounter's an element it does not
-   * recognize. This gives the adapter a chance to request parsing of the data.
-   *
-   * @param nextElementQName
-   *          the next element's namespace-qualified name
-   * @return {@code true} if the adapter will parse the element, or {@code false}
-   *         otherwise
-   */
-  boolean canHandleQName(@NonNull QName nextElementQName);
-
-  /**
-   * Parses a provided string. Used to parse XML attributes, simple XML character
-   * data, and JSON/YAML property values.
-   *
-   * @param value
-   *          the string value to parse
-   * @return the parsed data as the adapter's type
-   * @throws IllegalArgumentException
-   *           if the data is not valid to the data type
-   */
-  @NonNull
-  TYPE parse(@NonNull String value);
-
-  /**
-   * This method is expected to parse content starting at the next event. Parsing
-   * will continue until the next event represents content that is not handled by
-   * this adapter. This means the event stream should be positioned after any
-   * {@link XMLEvent#END_ELEMENT} that corresponds to an
-   * {@link XMLEvent#START_ELEMENT} parsed by this adapter.
-   * <p>
-   * If {@link #isParsingStartElement()} returns {@code true}, then the first
-   * event to parse will be the {@link XMLEvent#START_ELEMENT} for the element
-   * that contains the value data, then the value data. If this is the case, this
-   * method must also parse the corresponding {@link XMLEvent#END_ELEMENT}.
-   * Otherwise, the first event to parse will be the value data.
-   * <p>
-   * The value data is expected to be parsed completely, leaving the event stream
-   * on a peeked event corresponding to content that is not handled by this
-   * method.
-   *
-   * @param eventReader
-   *          the XML parser used to read the parsed value
-   * @return the parsed value
-   * @throws IOException
-   *           if a parsing error occurs
-   */
-  @NonNull
-  TYPE parse(@NonNull XMLEventReader2 eventReader) throws IOException;
-
-  /**
-   * Parses a JSON property value.
-   *
-   * @param parser
-   *          the JSON parser used to read the parsed value
-   * @return the parsed value
-   * @throws IOException
-   *           if a parsing error occurs
-   */
-  @NonNull
-  TYPE parse(@NonNull JsonParser parser) throws IOException;
-
-  /**
-   * Parses a provided string using {@link #parse(String)}.
-   * <p>
-   * This method may pre-parse the data and then return copies, since the data can
-   * only be parsed once, but the supplier might be called multiple times.
-   *
-   * @param value
-   *          the string value to parse
-   * @return a supplier that will provide new instances of the parsed data
-   * @throws IOException
-   *           if an error occurs while parsing
-   * @see #parse(String)
-   */
-  @NonNull
-  default Supplier<TYPE> parseAndSupply(@NonNull String value) throws IOException {
-    TYPE retval = parse(value);
-    return () -> copy(retval);
-  }
-
-  /**
-   * Parses a provided string using
-   * {@link IDataTypeAdapter#parse(XMLEventReader2)}.
-   * <p>
-   * This method may pre-parse the data and then return copies, since the data can
-   * only be parsed once, but the supplier might be called multiple times.
-   *
-   * @param eventReader
-   *          the XML parser used to read the parsed value
-   * @return a supplier that will provide new instances of the parsed data
-   * @throws IOException
-   *           if an error occurs while parsing
-   * @see #parse(String)
-   * @see #parse(XMLEventReader2)
-   */
-  @NonNull
-  default Supplier<TYPE> parseAndSupply(@NonNull XMLEventReader2 eventReader) throws IOException {
-    TYPE retval = parse(eventReader);
-    return () -> copy(retval);
-  }
-
-  /**
-   * Parses a provided string using {@link #parse(JsonParser)}.
-   * <p>
-   * This method may pre-parse the data and then return copies, since the data can
-   * only be parsed once, but the supplier might be called multiple times.
-   *
-   * @param parser
-   *          the JSON parser used to read the parsed value
-   * @return a supplier that will provide new instances of the parsed data
-   * @throws IOException
-   *           if an error occurs while parsing
-   * @see #parse(String)
-   * @see #parse(JsonParser)
-   */
-  @NonNull
-  default Supplier<TYPE> parseAndSupply(@NonNull JsonParser parser) throws IOException {
-    TYPE retval = parse(parser);
-    return () -> copy(retval);
-  }
-
-  /**
-   * Writes the provided Java class instance data as XML. The parent element
-   * information is provided as a {@link StartElement} event, which allows
-   * namespace information to be obtained from the parent element using the
-   * {@link StartElement#getName()} and {@link StartElement#getNamespaceContext()}
-   * methods, which can be used when writing the provided instance value.
-   *
-   * @param instance
-   *          the {@link Field} instance value to write
-   * @param parent
-   *          the {@link StartElement} XML event that is the parent of the data to
-   *          write
-   * @param eventFactory
-   *          the XML event factory used to generate XML writing events
-   * @param eventWriter
-   *          the XML writer used to output XML as events
-   * @throws XMLStreamException
-   *           if an unexpected error occurred while processing the XML output
-   * @throws IOException
-   *           if an unexpected error occurred while writing to the output stream
-   */
-  void writeXmlValue(@NonNull Object instance, @NonNull StartElement parent, @NonNull XMLEventFactory2 eventFactory,
-      @NonNull XMLEventWriter eventWriter)
-      throws IOException, XMLStreamException;
-
-  /**
-   * Writes the provided Java class instance data as XML. The parent element
-   * information is provided as an XML {@link QName}, which allows namespace
-   * information to be obtained from the parent element. Additional namespace
-   * information can be gathered using the
-   * {@link XMLStreamWriter2#getNamespaceContext()} method, which can be used when
-   * writing the provided instance value.
-   *
-   * @param instance
-   *          the {@link Field} instance value to write
-   * @param parentName
-   *          the qualified name of the XML data's parent element
-   * @param writer
-   *          the XML writer used to output the XML data
-   * @throws XMLStreamException
-   *           if an unexpected error occurred while processing the XML output
-   */
-  void writeXmlValue(@NonNull Object instance, @NonNull QName parentName, @NonNull XMLStreamWriter2 writer)
-      throws XMLStreamException;
-
-  /**
-   * Writes the provided Java class instance as a JSON/YAML field value.
-   *
-   * @param instance
-   *          the {@link Field} instance value to write
-   * @param writer
-   *          the JSON/YAML writer used to output the JSON/YAML data
-   * @throws IOException
-   *           if an unexpected error occurred while writing the JSON/YAML output
-   */
-  void writeJsonValue(@NonNull Object instance, @NonNull JsonGenerator writer) throws IOException;
-
-  /**
-   * Gets the default value to use as the JSON/YAML field name for a Metaschema
-   * field value if no JSON value key flag or name is configured.
-   *
-   * @return the default field name to use
-   */
-  @NonNull
-  String getDefaultJsonValueKey();
-
-  /**
-   * Determines if the data type's value is allowed to be unwrapped in XML when
-   * the value is a field value.
-   *
-   * @return {@code true} if allowed, or {@code false} otherwise.
-   */
-  boolean isUnrappedValueAllowedInXml();
-
-  /**
-   * Determines if the datatype uses mixed text and element content in XML.
-   *
-   * @return {@code true} if the datatype uses mixed text and element content in
-   *         XML, or {@code false} otherwise
-   */
-  boolean isXmlMixed();
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import org.codehaus.stax2.XMLEventReader2;
+import org.codehaus.stax2.XMLStreamWriter2;
+import org.codehaus.stax2.evt.XMLEventFactory2;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.function.Supplier;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.StartElement;
+import javax.xml.stream.events.XMLEvent;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public interface IDataTypeAdapter<TYPE> {
+
+  /**
+   * Get the metaschema type names associated with this adapter. This name must be
+   * unique with respect to all other metaschema types.
+   * <p>
+   * At least one name must be provided, with the first name being the most
+   * preferred name.
+   *
+   * @return the name
+   */
+  @NonNull
+  List<QName> getNames();
+
+  /**
+   * Get the most preferred name for this data type.
+   *
+   * @return the name
+   */
+  @NonNull
+  default QName getPreferredName() {
+    return ObjectUtils.notNull(getNames().iterator().next());
+  }
+
+  /**
+   * The JSON primative type of the data type.
+   *
+   * @return the JSON data type
+   */
+  JsonFormatTypes getJsonRawType();
+
+  /**
+   * Get the Java class supported by this adapter.
+   *
+   * @return the Java class
+   */
+  @NonNull
+  Class<TYPE> getJavaClass();
+
+  /**
+   * Casts the provided value to the type associated with this adapter.
+   *
+   * @param value
+   *          a value of the provided type
+   * @return the typed value
+   */
+  @NonNull
+  TYPE toValue(@NonNull Object value);
+
+  /**
+   * Gets the value as a string suitable for writing as text. This is intended for
+   * data types that have a simple string-based structure in XML and JSON, such as
+   * for XML attributes or JSON keys. An adapter for a complex data structures
+   * that consist of XML elements will throw an
+   * {@link UnsupportedOperationException} when this is called.
+   *
+   * @param value
+   *          the data to formatted as a string
+   * @return a string
+   * @throws UnsupportedOperationException
+   *           if the data type cannot be represented as a string
+   */
+  @NonNull
+  String asString(@NonNull Object value);
+
+  /**
+   * Create a copy of the provided value.
+   *
+   * @param obj
+   *          the value to copy
+   * @return the copy
+   */
+  @NonNull
+  TYPE copy(@NonNull Object obj);
+
+  /**
+   * Determines if the data type is an atomic, scalar value. Complex structures
+   * such as Markup are not considered atomic.
+   *
+   * @return {@code true} if the data type is an atomic scalar value, or
+   *         {@code false} otherwise
+   */
+  default boolean isAtomic() {
+    return true;
+  }
+
+  /**
+   * Get the java type of the associated item.
+   *
+   * @return the java associated item type
+   */
+  @NonNull
+  Class<? extends IAnyAtomicItem> getItemClass();
+
+  /**
+   * Construct a new item of this type using the provided value.
+   *
+   * @param value
+   *          the item's value
+   * @return a new item
+   */
+  // TODO: markup types are not atomic values. Figure out a better base type
+  // (i.e., IValuedItem)
+  @NonNull
+  IAnyAtomicItem newItem(@NonNull Object value);
+
+  /**
+   * Cast the provided item to an item of this type, if possible.
+   *
+   * @param item
+   *          the atomic item to cast
+   * @return an atomic item of this type
+   * @throws InvalidValueForCastFunctionException
+   *           if the provided item type cannot be cast to this item type
+   */
+  @NonNull
+  IAnyAtomicItem cast(IAnyAtomicItem item);
+
+  /**
+   * Indicates if the adapter will parse the {@link XMLEvent#START_ELEMENT} before
+   * parsing the value data.
+   *
+   * @return {@code true} if the adapter requires the start element for parsing,
+   *         or {@code false} otherwise
+   */
+  // TODO; implement or remove this
+  boolean isParsingStartElement();
+
+  /**
+   * Determines if adapter can parse the next element. The next element's
+   * {@link QName} is provided for this purpose.
+   * <p>
+   * This will be called when the parser encounter's an element it does not
+   * recognize. This gives the adapter a chance to request parsing of the data.
+   *
+   * @param nextElementQName
+   *          the next element's namespace-qualified name
+   * @return {@code true} if the adapter will parse the element, or {@code false}
+   *         otherwise
+   */
+  boolean canHandleQName(@NonNull QName nextElementQName);
+
+  /**
+   * Parses a provided string. Used to parse XML attributes, simple XML character
+   * data, and JSON/YAML property values.
+   *
+   * @param value
+   *          the string value to parse
+   * @return the parsed data as the adapter's type
+   * @throws IllegalArgumentException
+   *           if the data is not valid to the data type
+   */
+  @NonNull
+  TYPE parse(@NonNull String value);
+
+  /**
+   * This method is expected to parse content starting at the next event. Parsing
+   * will continue until the next event represents content that is not handled by
+   * this adapter. This means the event stream should be positioned after any
+   * {@link XMLEvent#END_ELEMENT} that corresponds to an
+   * {@link XMLEvent#START_ELEMENT} parsed by this adapter.
+   * <p>
+   * If {@link #isParsingStartElement()} returns {@code true}, then the first
+   * event to parse will be the {@link XMLEvent#START_ELEMENT} for the element
+   * that contains the value data, then the value data. If this is the case, this
+   * method must also parse the corresponding {@link XMLEvent#END_ELEMENT}.
+   * Otherwise, the first event to parse will be the value data.
+   * <p>
+   * The value data is expected to be parsed completely, leaving the event stream
+   * on a peeked event corresponding to content that is not handled by this
+   * method.
+   *
+   * @param eventReader
+   *          the XML parser used to read the parsed value
+   * @return the parsed value
+   * @throws IOException
+   *           if a parsing error occurs
+   */
+  @NonNull
+  TYPE parse(@NonNull XMLEventReader2 eventReader) throws IOException;
+
+  /**
+   * Parses a JSON property value.
+   *
+   * @param parser
+   *          the JSON parser used to read the parsed value
+   * @return the parsed value
+   * @throws IOException
+   *           if a parsing error occurs
+   */
+  @NonNull
+  TYPE parse(@NonNull JsonParser parser) throws IOException;
+
+  /**
+   * Parses a provided string using {@link #parse(String)}.
+   * <p>
+   * This method may pre-parse the data and then return copies, since the data can
+   * only be parsed once, but the supplier might be called multiple times.
+   *
+   * @param value
+   *          the string value to parse
+   * @return a supplier that will provide new instances of the parsed data
+   * @throws IOException
+   *           if an error occurs while parsing
+   * @see #parse(String)
+   */
+  @NonNull
+  default Supplier<TYPE> parseAndSupply(@NonNull String value) throws IOException {
+    TYPE retval = parse(value);
+    return () -> copy(retval);
+  }
+
+  /**
+   * Parses a provided string using
+   * {@link IDataTypeAdapter#parse(XMLEventReader2)}.
+   * <p>
+   * This method may pre-parse the data and then return copies, since the data can
+   * only be parsed once, but the supplier might be called multiple times.
+   *
+   * @param eventReader
+   *          the XML parser used to read the parsed value
+   * @return a supplier that will provide new instances of the parsed data
+   * @throws IOException
+   *           if an error occurs while parsing
+   * @see #parse(String)
+   * @see #parse(XMLEventReader2)
+   */
+  @NonNull
+  default Supplier<TYPE> parseAndSupply(@NonNull XMLEventReader2 eventReader) throws IOException {
+    TYPE retval = parse(eventReader);
+    return () -> copy(retval);
+  }
+
+  /**
+   * Parses a provided string using {@link #parse(JsonParser)}.
+   * <p>
+   * This method may pre-parse the data and then return copies, since the data can
+   * only be parsed once, but the supplier might be called multiple times.
+   *
+   * @param parser
+   *          the JSON parser used to read the parsed value
+   * @return a supplier that will provide new instances of the parsed data
+   * @throws IOException
+   *           if an error occurs while parsing
+   * @see #parse(String)
+   * @see #parse(JsonParser)
+   */
+  @NonNull
+  default Supplier<TYPE> parseAndSupply(@NonNull JsonParser parser) throws IOException {
+    TYPE retval = parse(parser);
+    return () -> copy(retval);
+  }
+
+  /**
+   * Writes the provided Java class instance data as XML. The parent element
+   * information is provided as a {@link StartElement} event, which allows
+   * namespace information to be obtained from the parent element using the
+   * {@link StartElement#getName()} and {@link StartElement#getNamespaceContext()}
+   * methods, which can be used when writing the provided instance value.
+   *
+   * @param instance
+   *          the {@link Field} instance value to write
+   * @param parent
+   *          the {@link StartElement} XML event that is the parent of the data to
+   *          write
+   * @param eventFactory
+   *          the XML event factory used to generate XML writing events
+   * @param eventWriter
+   *          the XML writer used to output XML as events
+   * @throws XMLStreamException
+   *           if an unexpected error occurred while processing the XML output
+   * @throws IOException
+   *           if an unexpected error occurred while writing to the output stream
+   */
+  void writeXmlValue(@NonNull Object instance, @NonNull StartElement parent, @NonNull XMLEventFactory2 eventFactory,
+      @NonNull XMLEventWriter eventWriter)
+      throws IOException, XMLStreamException;
+
+  /**
+   * Writes the provided Java class instance data as XML. The parent element
+   * information is provided as an XML {@link QName}, which allows namespace
+   * information to be obtained from the parent element. Additional namespace
+   * information can be gathered using the
+   * {@link XMLStreamWriter2#getNamespaceContext()} method, which can be used when
+   * writing the provided instance value.
+   *
+   * @param instance
+   *          the {@link Field} instance value to write
+   * @param parentName
+   *          the qualified name of the XML data's parent element
+   * @param writer
+   *          the XML writer used to output the XML data
+   * @throws XMLStreamException
+   *           if an unexpected error occurred while processing the XML output
+   */
+  void writeXmlValue(@NonNull Object instance, @NonNull QName parentName, @NonNull XMLStreamWriter2 writer)
+      throws XMLStreamException;
+
+  /**
+   * Writes the provided Java class instance as a JSON/YAML field value.
+   *
+   * @param instance
+   *          the {@link Field} instance value to write
+   * @param writer
+   *          the JSON/YAML writer used to output the JSON/YAML data
+   * @throws IOException
+   *           if an unexpected error occurred while writing the JSON/YAML output
+   */
+  void writeJsonValue(@NonNull Object instance, @NonNull JsonGenerator writer) throws IOException;
+
+  /**
+   * Gets the default value to use as the JSON/YAML field name for a Metaschema
+   * field value if no JSON value key flag or name is configured.
+   *
+   * @return the default field name to use
+   */
+  @NonNull
+  String getDefaultJsonValueKey();
+
+  /**
+   * Determines if the data type's value is allowed to be unwrapped in XML when
+   * the value is a field value.
+   *
+   * @return {@code true} if allowed, or {@code false} otherwise.
+   */
+  boolean isUnrappedValueAllowedInXml();
+
+  /**
+   * Determines if the datatype uses mixed text and element content in XML.
+   *
+   * @return {@code true} if the datatype uses mixed text and element content in
+   *         XML, or {@code false} otherwise
+   */
+  boolean isXmlMixed();
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/Base64Adapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/Base64Adapter.java
index 4e40ba80d..abd644013 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/Base64Adapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/Base64Adapter.java
@@ -1,101 +1,104 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.nio.ByteBuffer;
-import java.util.Base64;
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class Base64Adapter
-    extends AbstractDataTypeAdapter<ByteBuffer, IBase64BinaryItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of(
-          "base64",
-          // for backwards compatibility with original type name
-          "base64Binary"));
-
-  Base64Adapter() {
-    super(ByteBuffer.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public JsonFormatTypes getJsonRawType() {
-    return JsonFormatTypes.STRING;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public ByteBuffer parse(String value) {
-    Base64.Decoder decoder = Base64.getDecoder();
-    byte[] result = decoder.decode(value);
-    return ByteBuffer.wrap(result);
-  }
-
-  @Override
-  public ByteBuffer copy(Object obj) {
-    ByteBuffer buffer = (ByteBuffer) obj;
-    final ByteBuffer clone
-        = buffer.isDirect() ? ByteBuffer.allocateDirect(buffer.capacity()) : ByteBuffer.allocate(buffer.capacity());
-    final ByteBuffer readOnlyCopy = buffer.asReadOnlyBuffer();
-    readOnlyCopy.flip();
-    clone.put(readOnlyCopy);
-    return clone;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public String asString(Object value) {
-    Base64.Encoder encoder = Base64.getEncoder();
-    return encoder.encodeToString(((ByteBuffer) value).array());
-  }
-
-  @Override
-  public Class<IBase64BinaryItem> getItemClass() {
-    return IBase64BinaryItem.class;
-  }
-
-  @Override
-  public IBase64BinaryItem newItem(Object value) {
-    ByteBuffer item = toValue(value);
-    return IBase64BinaryItem.valueOf(item);
-  }
-
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.nio.ByteBuffer;
+import java.util.Base64;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class Base64Adapter
+    extends AbstractDataTypeAdapter<ByteBuffer, IBase64BinaryItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "base64"),
+          // for backwards compatibility with original type name
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "base64Binary")));
+
+  Base64Adapter() {
+    super(ByteBuffer.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public JsonFormatTypes getJsonRawType() {
+    return JsonFormatTypes.STRING;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public ByteBuffer parse(String value) {
+    Base64.Decoder decoder = Base64.getDecoder();
+    byte[] result = decoder.decode(value);
+    return ByteBuffer.wrap(result);
+  }
+
+  @Override
+  public ByteBuffer copy(Object obj) {
+    ByteBuffer buffer = (ByteBuffer) obj;
+    final ByteBuffer clone
+        = buffer.isDirect() ? ByteBuffer.allocateDirect(buffer.capacity()) : ByteBuffer.allocate(buffer.capacity());
+    final ByteBuffer readOnlyCopy = buffer.asReadOnlyBuffer();
+    readOnlyCopy.flip();
+    clone.put(readOnlyCopy);
+    return clone;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public String asString(Object value) {
+    Base64.Encoder encoder = Base64.getEncoder();
+    return encoder.encodeToString(((ByteBuffer) value).array());
+  }
+
+  @Override
+  public Class<IBase64BinaryItem> getItemClass() {
+    return IBase64BinaryItem.class;
+  }
+
+  @Override
+  public IBase64BinaryItem newItem(Object value) {
+    ByteBuffer item = toValue(value);
+    return IBase64BinaryItem.valueOf(item);
+  }
+
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/BooleanAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/BooleanAdapter.java
index 133f8f0dc..9fa446493 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/BooleanAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/BooleanAdapter.java
@@ -1,156 +1,159 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.io.IOException;
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class BooleanAdapter
-    extends AbstractDataTypeAdapter<Boolean, IBooleanItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("boolean"));
-
-  BooleanAdapter() {
-    super(Boolean.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public JsonFormatTypes getJsonRawType() {
-    return JsonFormatTypes.BOOLEAN;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public Boolean parse(String value) {
-    return Boolean.valueOf(value);
-  }
-
-  @Override
-  public Boolean parse(JsonParser parser) throws IOException {
-    Boolean value = parser.getBooleanValue();
-    // skip over value
-    parser.nextToken();
-    return value;
-  }
-
-  @Override
-  public void writeJsonValue(Object value, JsonGenerator generator)
-      throws IOException {
-    try {
-      generator.writeBoolean((Boolean) value);
-    } catch (ClassCastException ex) {
-      throw new IOException(ex);
-    }
-  }
-
-  @Override
-  public Boolean copy(Object obj) {
-    // the value is immutable
-    return (Boolean) obj;
-  }
-
-  @Override
-  public Class<IBooleanItem> getItemClass() {
-    return IBooleanItem.class;
-  }
-
-  @Override
-  public IBooleanItem newItem(Object value) {
-    Boolean item = toValue(value);
-    return IBooleanItem.valueOf(item);
-  }
-
-  @Override
-  protected IBooleanItem castInternal(@NonNull IAnyAtomicItem item) {
-    IBooleanItem retval;
-    if (item instanceof INumericItem) {
-      retval = castToBoolean((INumericItem) item);
-    } else if (item instanceof IStringItem) {
-      retval = castToBoolean((IStringItem) item);
-    } else {
-      retval = castToBoolean(item.asStringItem());
-    }
-    return retval;
-  }
-
-  /**
-   * Cast the provided numeric value to a boolean. Any non-zero value will be
-   * {@code true}, or {@code false} otherwise.
-   *
-   * @param item
-   *          the item to cast
-   * @return {@code true} if the item value is non-zero, or {@code false}
-   *         otherwise
-   */
-  @NonNull
-  protected IBooleanItem castToBoolean(@NonNull INumericItem item) {
-    return IBooleanItem.valueOf(item.toEffectiveBoolean());
-  }
-
-  /**
-   * If the string is a numeric value, treat it as so. Otherwise parse the value
-   * as a boolean string.
-   *
-   * @param item
-   *          the item to cast
-   * @return the effective boolean value of the string
-   * @throws InvalidValueForCastFunctionException
-   *           if the provided item cannot be cast to a boolean value by any means
-   */
-  @NonNull
-  protected IBooleanItem castToBoolean(@NonNull IStringItem item) {
-    IBooleanItem retval;
-    try {
-      INumericItem numeric = INumericItem.cast(item);
-      retval = castToBoolean(numeric);
-    } catch (InvalidValueForCastFunctionException ex) {
-      retval = super.castInternal(item);
-    }
-    return retval;
-  }
-
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class BooleanAdapter
+    extends AbstractDataTypeAdapter<Boolean, IBooleanItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "boolean")));
+
+  BooleanAdapter() {
+    super(Boolean.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public JsonFormatTypes getJsonRawType() {
+    return JsonFormatTypes.BOOLEAN;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public Boolean parse(String value) {
+    return Boolean.valueOf(value);
+  }
+
+  @Override
+  public Boolean parse(JsonParser parser) throws IOException {
+    Boolean value = parser.getBooleanValue();
+    // skip over value
+    parser.nextToken();
+    return value;
+  }
+
+  @Override
+  public void writeJsonValue(Object value, JsonGenerator generator)
+      throws IOException {
+    try {
+      generator.writeBoolean((Boolean) value);
+    } catch (ClassCastException ex) {
+      throw new IOException(ex);
+    }
+  }
+
+  @Override
+  public Boolean copy(Object obj) {
+    // the value is immutable
+    return (Boolean) obj;
+  }
+
+  @Override
+  public Class<IBooleanItem> getItemClass() {
+    return IBooleanItem.class;
+  }
+
+  @Override
+  public IBooleanItem newItem(Object value) {
+    Boolean item = toValue(value);
+    return IBooleanItem.valueOf(item);
+  }
+
+  @Override
+  protected IBooleanItem castInternal(@NonNull IAnyAtomicItem item) {
+    IBooleanItem retval;
+    if (item instanceof INumericItem) {
+      retval = castToBoolean((INumericItem) item);
+    } else if (item instanceof IStringItem) {
+      retval = castToBoolean((IStringItem) item);
+    } else {
+      retval = castToBoolean(item.asStringItem());
+    }
+    return retval;
+  }
+
+  /**
+   * Cast the provided numeric value to a boolean. Any non-zero value will be
+   * {@code true}, or {@code false} otherwise.
+   *
+   * @param item
+   *          the item to cast
+   * @return {@code true} if the item value is non-zero, or {@code false}
+   *         otherwise
+   */
+  @NonNull
+  protected IBooleanItem castToBoolean(@NonNull INumericItem item) {
+    return IBooleanItem.valueOf(item.toEffectiveBoolean());
+  }
+
+  /**
+   * If the string is a numeric value, treat it as so. Otherwise parse the value
+   * as a boolean string.
+   *
+   * @param item
+   *          the item to cast
+   * @return the effective boolean value of the string
+   * @throws InvalidValueForCastFunctionException
+   *           if the provided item cannot be cast to a boolean value by any means
+   */
+  @NonNull
+  protected IBooleanItem castToBoolean(@NonNull IStringItem item) {
+    IBooleanItem retval;
+    try {
+      INumericItem numeric = INumericItem.cast(item);
+      retval = castToBoolean(numeric);
+    } catch (InvalidValueForCastFunctionException ex) {
+      retval = super.castInternal(item);
+    }
+    return retval;
+  }
+
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateAdapter.java
index 349431e9f..c3beb3d3e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateAdapter.java
@@ -1,147 +1,150 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.datatype.object.Date;
-import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUntypedAtomicItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeParseException;
-import java.time.temporal.TemporalAccessor;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class DateAdapter
-    extends AbstractCustomJavaDataTypeAdapter<Date, IDateItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("date"));
-  private static final Pattern DATE_TIMEZONE = Pattern.compile("^("
-      + "^(?:(?:2000|2400|2800|(?:19|2[0-9](?:0[48]|[2468][048]|[13579][26])))-02-29)"
-      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-02-(?:0[1-9]|1[0-9]|2[0-8]))"
-      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-(?:0[13578]|10|12)-(?:0[1-9]|[12][0-9]|3[01]))"
-      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-(?:0[469]|11)-(?:0[1-9]|[12][0-9]|30))"
-      + ")"
-      + "(Z|[+-][0-9]{2}:[0-9]{2})?$");
-
-  DateAdapter() {
-    super(Date.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public JsonFormatTypes getJsonRawType() {
-    return JsonFormatTypes.STRING;
-  }
-
-  @Override
-  public Date parse(String value) {
-    Matcher matcher = DATE_TIMEZONE.matcher(value);
-    if (!matcher.matches()) {
-      throw new IllegalArgumentException("Invalid date: " + value);
-    }
-
-    String parseValue
-        = String.format("%sT00:00:00%s", matcher.group(1), matcher.group(2) == null ? "" : matcher.group(2));
-    try {
-      TemporalAccessor accessor = DateFormats.DATE_TIME_WITH_TZ.parse(parseValue);
-      return new Date(ObjectUtils.notNull(ZonedDateTime.from(accessor)), true); // NOPMD - readability
-    } catch (DateTimeParseException ex) {
-      try {
-        TemporalAccessor accessor = DateFormats.DATE_TIME_WITHOUT_TZ.parse(parseValue);
-        LocalDate date = LocalDate.from(accessor);
-        return new Date(ObjectUtils.notNull(ZonedDateTime.of(date, LocalTime.MIN, ZoneOffset.UTC)), false);
-      } catch (DateTimeParseException ex2) {
-        IllegalArgumentException newEx = new IllegalArgumentException(ex2.getLocalizedMessage(), ex2);
-        newEx.addSuppressed(ex);
-        throw newEx; // NOPMD - false positive
-      }
-    }
-  }
-
-  @Override
-  public String asString(Object obj) {
-    Date value = (Date) obj;
-    String retval;
-    if (value.hasTimeZone()) {
-      @SuppressWarnings("null")
-      @NonNull String formatted = DateFormats.DATE_WITH_TZ.format(value.getValue());
-      retval = formatted;
-    } else {
-      @SuppressWarnings("null")
-      @NonNull String formatted = DateFormats.DATE_WITHOUT_TZ.format(value.getValue());
-      retval = formatted;
-    }
-    return retval;
-  }
-
-  @Override
-  public Class<IDateItem> getItemClass() {
-    return IDateItem.class;
-  }
-
-  @Override
-  public IDateItem newItem(Object value) {
-    Date item = toValue(value);
-    return IDateItem.valueOf(item);
-  }
-
-  @Override
-  protected @NonNull IDateItem castInternal(@NonNull IAnyAtomicItem item) {
-    IDateItem retval;
-    if (item instanceof IDateTimeItem) {
-      ZonedDateTime value = ((IDateTimeItem) item).asZonedDateTime();
-      retval = IDateItem.valueOf(value);
-    } else if (item instanceof IStringItem || item instanceof IUntypedAtomicItem) {
-      retval = super.castInternal(item);
-    } else {
-      throw new InvalidValueForCastFunctionException(
-          String.format("unsupported item type '%s'", item.getClass().getName()));
-    }
-    return retval;
-  }
-
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.datatype.object.Date;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUntypedAtomicItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.TemporalAccessor;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class DateAdapter
+    extends AbstractCustomJavaDataTypeAdapter<Date, IDateItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "date")));
+  private static final Pattern DATE_TIMEZONE = Pattern.compile("^("
+      + "^(?:(?:2000|2400|2800|(?:19|2[0-9](?:0[48]|[2468][048]|[13579][26])))-02-29)"
+      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-02-(?:0[1-9]|1[0-9]|2[0-8]))"
+      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-(?:0[13578]|10|12)-(?:0[1-9]|[12][0-9]|3[01]))"
+      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-(?:0[469]|11)-(?:0[1-9]|[12][0-9]|30))"
+      + ")"
+      + "(Z|[+-][0-9]{2}:[0-9]{2})?$");
+
+  DateAdapter() {
+    super(Date.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public JsonFormatTypes getJsonRawType() {
+    return JsonFormatTypes.STRING;
+  }
+
+  @Override
+  public Date parse(String value) {
+    Matcher matcher = DATE_TIMEZONE.matcher(value);
+    if (!matcher.matches()) {
+      throw new IllegalArgumentException("Invalid date: " + value);
+    }
+
+    String parseValue
+        = String.format("%sT00:00:00%s", matcher.group(1), matcher.group(2) == null ? "" : matcher.group(2));
+    try {
+      TemporalAccessor accessor = DateFormats.DATE_TIME_WITH_TZ.parse(parseValue);
+      return new Date(ObjectUtils.notNull(ZonedDateTime.from(accessor)), true); // NOPMD - readability
+    } catch (DateTimeParseException ex) {
+      try {
+        TemporalAccessor accessor = DateFormats.DATE_TIME_WITHOUT_TZ.parse(parseValue);
+        LocalDate date = LocalDate.from(accessor);
+        return new Date(ObjectUtils.notNull(ZonedDateTime.of(date, LocalTime.MIN, ZoneOffset.UTC)), false);
+      } catch (DateTimeParseException ex2) {
+        IllegalArgumentException newEx = new IllegalArgumentException(ex2.getLocalizedMessage(), ex2);
+        newEx.addSuppressed(ex);
+        throw newEx; // NOPMD - false positive
+      }
+    }
+  }
+
+  @Override
+  public String asString(Object obj) {
+    Date value = (Date) obj;
+    String retval;
+    if (value.hasTimeZone()) {
+      @SuppressWarnings("null")
+      @NonNull String formatted = DateFormats.DATE_WITH_TZ.format(value.getValue());
+      retval = formatted;
+    } else {
+      @SuppressWarnings("null")
+      @NonNull String formatted = DateFormats.DATE_WITHOUT_TZ.format(value.getValue());
+      retval = formatted;
+    }
+    return retval;
+  }
+
+  @Override
+  public Class<IDateItem> getItemClass() {
+    return IDateItem.class;
+  }
+
+  @Override
+  public IDateItem newItem(Object value) {
+    Date item = toValue(value);
+    return IDateItem.valueOf(item);
+  }
+
+  @Override
+  protected @NonNull IDateItem castInternal(@NonNull IAnyAtomicItem item) {
+    IDateItem retval;
+    if (item instanceof IDateTimeItem) {
+      ZonedDateTime value = ((IDateTimeItem) item).asZonedDateTime();
+      retval = IDateItem.valueOf(value);
+    } else if (item instanceof IStringItem || item instanceof IUntypedAtomicItem) {
+      retval = super.castInternal(item);
+    } else {
+      throw new InvalidValueForCastFunctionException(
+          String.format("unsupported item type '%s'", item.getClass().getName()));
+    }
+    return retval;
+  }
+
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeAdapter.java
index 90ca1d9e9..0573b3b3f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeAdapter.java
@@ -1,131 +1,134 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.datatype.object.DateTime;
-import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUntypedAtomicItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeParseException;
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class DateTimeAdapter
-    extends AbstractCustomJavaDataTypeAdapter<DateTime, IDateTimeItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of(
-          "date-time",
-          // for backwards compatibility with original type name
-          "dateTime"));
-
-  DateTimeAdapter() {
-    super(DateTime.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public JsonFormatTypes getJsonRawType() {
-    return JsonFormatTypes.STRING;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public DateTime parse(String value) {
-    try {
-      return new DateTime(ZonedDateTime.from(DateFormats.DATE_TIME_WITH_TZ.parse(value)), true); // NOPMD - readability
-    } catch (DateTimeParseException ex) {
-      try {
-        LocalDateTime dateTime = LocalDateTime.from(DateFormats.DATE_TIME_WITHOUT_TZ.parse(value));
-        return new DateTime(ZonedDateTime.of(dateTime, ZoneOffset.UTC), false);
-      } catch (DateTimeParseException ex2) {
-        IllegalArgumentException newEx = new IllegalArgumentException(ex2.getLocalizedMessage(), ex2);
-        newEx.addSuppressed(ex);
-        throw newEx; // NOPMD - it's ok
-      }
-    }
-  }
-
-  @Override
-  public String asString(Object obj) {
-    DateTime value = (DateTime) obj;
-    String retval;
-    if (value.hasTimeZone()) {
-      @SuppressWarnings("null")
-      @NonNull String formatted = DateFormats.DATE_TIME_WITH_TZ.format(value.getValue());
-      retval = formatted;
-    } else {
-      @SuppressWarnings("null")
-      @NonNull String formatted = DateFormats.DATE_TIME_WITHOUT_TZ.format(value.getValue());
-      retval = formatted;
-    }
-    return retval;
-  }
-
-  @Override
-  public Class<IDateTimeItem> getItemClass() {
-    return IDateTimeItem.class;
-  }
-
-  @Override
-  public IDateTimeItem newItem(Object value) {
-    DateTime item = toValue(value);
-    return IDateTimeItem.valueOf(item);
-  }
-
-  @Override
-  protected IDateTimeItem castInternal(@NonNull IAnyAtomicItem item) {
-    // TODO: bring up to spec
-    IDateTimeItem retval;
-    if (item instanceof IDateItem) {
-      retval = IDateTimeItem.valueOf(((IDateItem) item).asZonedDateTime());
-    } else if (item instanceof IStringItem || item instanceof IUntypedAtomicItem) {
-      retval = super.castInternal(item);
-    } else {
-      throw new InvalidValueForCastFunctionException(
-          String.format("unsupported item type '%s'", item.getClass().getName()));
-    }
-    return retval;
-  }
-
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.datatype.object.DateTime;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.InvalidValueForCastFunctionException;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUntypedAtomicItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeParseException;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class DateTimeAdapter
+    extends AbstractCustomJavaDataTypeAdapter<DateTime, IDateTimeItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "date-time"),
+          // for backwards compatibility with original type name
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "dateTime")));
+
+  DateTimeAdapter() {
+    super(DateTime.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public JsonFormatTypes getJsonRawType() {
+    return JsonFormatTypes.STRING;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public DateTime parse(String value) {
+    try {
+      return new DateTime(ZonedDateTime.from(DateFormats.DATE_TIME_WITH_TZ.parse(value)), true); // NOPMD - readability
+    } catch (DateTimeParseException ex) {
+      try {
+        LocalDateTime dateTime = LocalDateTime.from(DateFormats.DATE_TIME_WITHOUT_TZ.parse(value));
+        return new DateTime(ZonedDateTime.of(dateTime, ZoneOffset.UTC), false);
+      } catch (DateTimeParseException ex2) {
+        IllegalArgumentException newEx = new IllegalArgumentException(ex2.getLocalizedMessage(), ex2);
+        newEx.addSuppressed(ex);
+        throw newEx; // NOPMD - it's ok
+      }
+    }
+  }
+
+  @Override
+  public String asString(Object obj) {
+    DateTime value = (DateTime) obj;
+    String retval;
+    if (value.hasTimeZone()) {
+      @SuppressWarnings("null")
+      @NonNull String formatted = DateFormats.DATE_TIME_WITH_TZ.format(value.getValue());
+      retval = formatted;
+    } else {
+      @SuppressWarnings("null")
+      @NonNull String formatted = DateFormats.DATE_TIME_WITHOUT_TZ.format(value.getValue());
+      retval = formatted;
+    }
+    return retval;
+  }
+
+  @Override
+  public Class<IDateTimeItem> getItemClass() {
+    return IDateTimeItem.class;
+  }
+
+  @Override
+  public IDateTimeItem newItem(Object value) {
+    DateTime item = toValue(value);
+    return IDateTimeItem.valueOf(item);
+  }
+
+  @Override
+  protected IDateTimeItem castInternal(@NonNull IAnyAtomicItem item) {
+    // TODO: bring up to spec
+    IDateTimeItem retval;
+    if (item instanceof IDateItem) {
+      retval = IDateTimeItem.valueOf(((IDateItem) item).asZonedDateTime());
+    } else if (item instanceof IStringItem || item instanceof IUntypedAtomicItem) {
+      retval = super.castInternal(item);
+    } else {
+      throw new InvalidValueForCastFunctionException(
+          String.format("unsupported item type '%s'", item.getClass().getName()));
+    }
+    return retval;
+  }
+
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java
index ea6c44537..1bfbf278e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java
@@ -1,96 +1,99 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeParseException;
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class DateTimeWithTZAdapter
-    extends AbstractDataTypeAdapter<ZonedDateTime, IDateTimeItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of(
-          "date-time-with-timezone",
-          // for backwards compatibility with original type name
-          "dateTime-with-timezone"));
-
-  DateTimeWithTZAdapter() {
-    super(ZonedDateTime.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public JsonFormatTypes getJsonRawType() {
-    return JsonFormatTypes.STRING;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public ZonedDateTime parse(String value) {
-    try {
-      return ZonedDateTime.from(DateFormats.DATE_TIME_WITH_TZ.parse(value));
-    } catch (DateTimeParseException ex) {
-      throw new IllegalArgumentException(ex.getLocalizedMessage(), ex);
-    }
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public String asString(Object value) {
-    return DateFormats.DATE_TIME_WITH_TZ.format((ZonedDateTime) value);
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public ZonedDateTime copy(Object obj) {
-    return ZonedDateTime.from((ZonedDateTime) obj);
-  }
-
-  @Override
-  public Class<IDateTimeItem> getItemClass() {
-    return IDateTimeItem.class;
-  }
-
-  @Override
-  public IDateTimeItem newItem(Object value) {
-    ZonedDateTime item = toValue(value);
-    return IDateTimeItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeParseException;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class DateTimeWithTZAdapter
+    extends AbstractDataTypeAdapter<ZonedDateTime, IDateTimeItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "date-time-with-timezone"),
+          // for backwards compatibility with original type name
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "dateTime-with-timezone")));
+
+  DateTimeWithTZAdapter() {
+    super(ZonedDateTime.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public JsonFormatTypes getJsonRawType() {
+    return JsonFormatTypes.STRING;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public ZonedDateTime parse(String value) {
+    try {
+      return ZonedDateTime.from(DateFormats.DATE_TIME_WITH_TZ.parse(value));
+    } catch (DateTimeParseException ex) {
+      throw new IllegalArgumentException(ex.getLocalizedMessage(), ex);
+    }
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public String asString(Object value) {
+    return DateFormats.DATE_TIME_WITH_TZ.format((ZonedDateTime) value);
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public ZonedDateTime copy(Object obj) {
+    return ZonedDateTime.from((ZonedDateTime) obj);
+  }
+
+  @Override
+  public Class<IDateTimeItem> getItemClass() {
+    return IDateTimeItem.class;
+  }
+
+  @Override
+  public IDateTimeItem newItem(Object value) {
+    ZonedDateTime item = toValue(value);
+    return IDateTimeItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateWithTZAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateWithTZAdapter.java
index f116e3c25..3d0040d7d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateWithTZAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateWithTZAdapter.java
@@ -1,108 +1,111 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeParseException;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class DateWithTZAdapter
-    extends AbstractDataTypeAdapter<ZonedDateTime, IDateItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of(
-          "date-with-timezone"));
-  private static final Pattern DATE_TIMEZONE = Pattern.compile("^("
-      + "^(?:(?:2000|2400|2800|(?:19|2[0-9](?:0[48]|[2468][048]|[13579][26])))-02-29)"
-      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-02-(?:0[1-9]|1[0-9]|2[0-8]))"
-      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-(?:0[13578]|10|12)-(?:0[1-9]|[12][0-9]|3[01]))"
-      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-(?:0[469]|11)-(?:0[1-9]|[12][0-9]|30))"
-      + ")"
-      + "(Z|[+-][0-9]{2}:[0-9]{2})$");
-
-  DateWithTZAdapter() {
-    super(ZonedDateTime.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public JsonFormatTypes getJsonRawType() {
-    return JsonFormatTypes.STRING;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public ZonedDateTime parse(String value) {
-    Matcher matcher = DATE_TIMEZONE.matcher(value);
-    if (!matcher.matches()) {
-      throw new IllegalArgumentException("Invalid date: " + value);
-    }
-    String parseValue = String.format("%sT00:00:00%s", matcher.group(1), matcher.group(2));
-    try {
-      return ZonedDateTime.from(DateFormats.DATE_TIME_WITH_TZ.parse(parseValue));
-    } catch (DateTimeParseException ex) {
-      throw new IllegalArgumentException(ex.getLocalizedMessage(), ex);
-    }
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public String asString(Object value) {
-    return DateFormats.DATE_WITH_TZ.format((ZonedDateTime) value);
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public ZonedDateTime copy(Object obj) {
-    return ZonedDateTime.from((ZonedDateTime) obj);
-  }
-
-  @Override
-  public Class<IDateItem> getItemClass() {
-    return IDateItem.class;
-  }
-
-  @Override
-  public IDateItem newItem(Object value) {
-    ZonedDateTime item = toValue(value);
-    return IDateItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeParseException;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class DateWithTZAdapter
+    extends AbstractDataTypeAdapter<ZonedDateTime, IDateItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "date-with-timezone")));
+  private static final Pattern DATE_TIMEZONE = Pattern.compile("^("
+      + "^(?:(?:2000|2400|2800|(?:19|2[0-9](?:0[48]|[2468][048]|[13579][26])))-02-29)"
+      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-02-(?:0[1-9]|1[0-9]|2[0-8]))"
+      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-(?:0[13578]|10|12)-(?:0[1-9]|[12][0-9]|3[01]))"
+      + "|(?:(?:(?:19|2[0-9])[0-9]{2})-(?:0[469]|11)-(?:0[1-9]|[12][0-9]|30))"
+      + ")"
+      + "(Z|[+-][0-9]{2}:[0-9]{2})$");
+
+  DateWithTZAdapter() {
+    super(ZonedDateTime.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public JsonFormatTypes getJsonRawType() {
+    return JsonFormatTypes.STRING;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public ZonedDateTime parse(String value) {
+    Matcher matcher = DATE_TIMEZONE.matcher(value);
+    if (!matcher.matches()) {
+      throw new IllegalArgumentException("Invalid date: " + value);
+    }
+    String parseValue = String.format("%sT00:00:00%s", matcher.group(1), matcher.group(2));
+    try {
+      return ZonedDateTime.from(DateFormats.DATE_TIME_WITH_TZ.parse(parseValue));
+    } catch (DateTimeParseException ex) {
+      throw new IllegalArgumentException(ex.getLocalizedMessage(), ex);
+    }
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public String asString(Object value) {
+    return DateFormats.DATE_WITH_TZ.format((ZonedDateTime) value);
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public ZonedDateTime copy(Object obj) {
+    return ZonedDateTime.from((ZonedDateTime) obj);
+  }
+
+  @Override
+  public Class<IDateItem> getItemClass() {
+    return IDateItem.class;
+  }
+
+  @Override
+  public IDateItem newItem(Object value) {
+    ZonedDateTime item = toValue(value);
+    return IDateItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DayTimeAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DayTimeAdapter.java
index 9e2e2c795..b058f2eac 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DayTimeAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DayTimeAdapter.java
@@ -29,6 +29,7 @@
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
 
 import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -36,20 +37,22 @@
 import java.time.format.DateTimeParseException;
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class DayTimeAdapter
     extends AbstractDataTypeAdapter<Duration, IDayTimeDurationItem> {
   @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("day-time-duration"));
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "day-time-duration")));
 
   DayTimeAdapter() {
     super(Duration.class);
   }
 
   @Override
-  public List<String> getNames() {
+  public List<QName> getNames() {
     return NAMES;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DecimalAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DecimalAdapter.java
index 0754a7cfd..49fd4ee29 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DecimalAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DecimalAdapter.java
@@ -1,115 +1,118 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class DecimalAdapter
-    extends AbstractDataTypeAdapter<BigDecimal, IDecimalItem> {
-  public static final MathContext MATH_CONTEXT = MathContext.DECIMAL64;
-  @NonNull
-  private static final BigDecimal DECIMAL_BOOLEAN_TRUE = new BigDecimal("1.0");
-  @NonNull
-  private static final BigDecimal DECIMAL_BOOLEAN_FALSE = new BigDecimal("0.0");
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("decimal"));
-
-  DecimalAdapter() {
-    super(BigDecimal.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public JsonFormatTypes getJsonRawType() {
-    return JsonFormatTypes.NUMBER;
-  }
-
-  @Override
-  public BigDecimal parse(String value) {
-    return new BigDecimal(value, MATH_CONTEXT);
-  }
-
-  @Override
-  public void writeJsonValue(Object value, JsonGenerator generator) throws IOException {
-    try {
-      generator.writeNumber((BigDecimal) value);
-    } catch (ClassCastException ex) {
-      throw new IOException(ex);
-    }
-  }
-
-  @Override
-  public BigDecimal copy(Object obj) {
-    // a BigDecimal is immutable
-    return (BigDecimal) obj;
-  }
-
-  @Override
-  public Class<IDecimalItem> getItemClass() {
-    return IDecimalItem.class;
-  }
-
-  @Override
-  public IDecimalItem newItem(Object value) {
-    BigDecimal item = toValue(value);
-    return IDecimalItem.valueOf(item);
-  }
-
-  @Override
-  protected IDecimalItem castInternal(@NonNull IAnyAtomicItem item) {
-    IDecimalItem retval;
-    if (item instanceof INumericItem) {
-      retval = newItem(((INumericItem) item).asDecimal());
-    } else if (item instanceof IBooleanItem) {
-      boolean value = ((IBooleanItem) item).toBoolean();
-      retval = newItem(value ? DECIMAL_BOOLEAN_TRUE : DECIMAL_BOOLEAN_FALSE);
-    } else {
-      retval = super.castInternal(item);
-    }
-    return retval;
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class DecimalAdapter
+    extends AbstractDataTypeAdapter<BigDecimal, IDecimalItem> {
+  public static final MathContext MATH_CONTEXT = MathContext.DECIMAL64;
+  @NonNull
+  private static final BigDecimal DECIMAL_BOOLEAN_TRUE = new BigDecimal("1.0");
+  @NonNull
+  private static final BigDecimal DECIMAL_BOOLEAN_FALSE = new BigDecimal("0.0");
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "decimal")));
+
+  DecimalAdapter() {
+    super(BigDecimal.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public JsonFormatTypes getJsonRawType() {
+    return JsonFormatTypes.NUMBER;
+  }
+
+  @Override
+  public BigDecimal parse(String value) {
+    return new BigDecimal(value, MATH_CONTEXT);
+  }
+
+  @Override
+  public void writeJsonValue(Object value, JsonGenerator generator) throws IOException {
+    try {
+      generator.writeNumber((BigDecimal) value);
+    } catch (ClassCastException ex) {
+      throw new IOException(ex);
+    }
+  }
+
+  @Override
+  public BigDecimal copy(Object obj) {
+    // a BigDecimal is immutable
+    return (BigDecimal) obj;
+  }
+
+  @Override
+  public Class<IDecimalItem> getItemClass() {
+    return IDecimalItem.class;
+  }
+
+  @Override
+  public IDecimalItem newItem(Object value) {
+    BigDecimal item = toValue(value);
+    return IDecimalItem.valueOf(item);
+  }
+
+  @Override
+  protected IDecimalItem castInternal(@NonNull IAnyAtomicItem item) {
+    IDecimalItem retval;
+    if (item instanceof INumericItem) {
+      retval = newItem(((INumericItem) item).asDecimal());
+    } else if (item instanceof IBooleanItem) {
+      boolean value = ((IBooleanItem) item).toBoolean();
+      retval = newItem(value ? DECIMAL_BOOLEAN_TRUE : DECIMAL_BOOLEAN_FALSE);
+    } else {
+      retval = super.castInternal(item);
+    }
+    return retval;
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/EmailAddressAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/EmailAddressAdapter.java
index 13b9b8657..9818890a2 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/EmailAddressAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/EmailAddressAdapter.java
@@ -1,64 +1,67 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IEmailAddressItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class EmailAddressAdapter
-    extends AbstractStringAdapter<IEmailAddressItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of(
-          "email-address",
-          // for backwards compatibility with original type name
-          "email"));
-
-  EmailAddressAdapter() {
-    // avoid general construction
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public @NonNull Class<IEmailAddressItem> getItemClass() {
-    return IEmailAddressItem.class;
-  }
-
-  @Override
-  public IEmailAddressItem newItem(Object value) {
-    String item = asString(value);
-    return IEmailAddressItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IEmailAddressItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class EmailAddressAdapter
+    extends AbstractStringAdapter<IEmailAddressItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "email-address"),
+          // for backwards compatibility with original type name
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "email")));
+
+  EmailAddressAdapter() {
+    // avoid general construction
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public @NonNull Class<IEmailAddressItem> getItemClass() {
+    return IEmailAddressItem.class;
+  }
+
+  @Override
+  public IEmailAddressItem newItem(Object value) {
+    String item = asString(value);
+    return IEmailAddressItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/HostnameAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/HostnameAdapter.java
index 30304b8aa..6b6a8455c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/HostnameAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/HostnameAdapter.java
@@ -1,61 +1,64 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IHostnameItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class HostnameAdapter
-    extends AbstractStringAdapter<IHostnameItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("hostname"));
-
-  HostnameAdapter() {
-    // avoid general construction
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public @NonNull Class<IHostnameItem> getItemClass() {
-    return IHostnameItem.class;
-  }
-
-  @Override
-  public IHostnameItem newItem(Object value) {
-    String item = asString(value);
-    return IHostnameItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IHostnameItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class HostnameAdapter
+    extends AbstractStringAdapter<IHostnameItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "hostname")));
+
+  HostnameAdapter() {
+    // avoid general construction
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public @NonNull Class<IHostnameItem> getItemClass() {
+    return IHostnameItem.class;
+  }
+
+  @Override
+  public IHostnameItem newItem(Object value) {
+    String item = asString(value);
+    return IHostnameItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv4AddressAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv4AddressAdapter.java
index 5c6aeb585..58ad33492 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv4AddressAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv4AddressAdapter.java
@@ -1,97 +1,108 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPv4AddressItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import inet.ipaddr.AddressStringException;
-import inet.ipaddr.IPAddressString;
-import inet.ipaddr.IPAddressStringParameters;
-import inet.ipaddr.IncompatibleAddressException;
-import inet.ipaddr.ipv4.IPv4Address;
-
-public class IPv4AddressAdapter
-    extends AbstractDataTypeAdapter<IPv4Address, IIPv4AddressItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("ip-v4-address"));
-  private static final IPAddressStringParameters IP_V_4;
-
-  static {
-    IP_V_4 = new IPAddressStringParameters.Builder().allowIPv6(false).allowEmpty(false).allowSingleSegment(false)
-        .allowWildcardedSeparator(false).getIPv4AddressParametersBuilder().allowBinary(false).allowLeadingZeros(false)
-        .allowPrefixesBeyondAddressSize(false).getParentBuilder().toParams();
-  }
-
-  IPv4AddressAdapter() {
-    super(IPv4Address.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public JsonFormatTypes getJsonRawType() {
-    return JsonFormatTypes.STRING;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public IPv4Address parse(String value) {
-    try {
-      return (IPv4Address) new IPAddressString(value, IP_V_4).toAddress();
-    } catch (AddressStringException | IncompatibleAddressException ex) {
-      throw new IllegalArgumentException(ex.getLocalizedMessage(), ex);
-    }
-  }
-
-  @Override
-  public IPv4Address copy(Object obj) {
-    // value is immutable
-    return (IPv4Address) obj;
-  }
-
-  @Override
-  public Class<IIPv4AddressItem> getItemClass() {
-    return IIPv4AddressItem.class;
-  }
-
-  @Override
-  public IIPv4AddressItem newItem(Object value) {
-    IPv4Address item = toValue(value);
-    return IIPv4AddressItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPv4AddressItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import inet.ipaddr.AddressStringException;
+import inet.ipaddr.IPAddressString;
+import inet.ipaddr.IPAddressStringParameters;
+import inet.ipaddr.IncompatibleAddressException;
+import inet.ipaddr.ipv4.IPv4Address;
+
+public class IPv4AddressAdapter
+    extends AbstractDataTypeAdapter<IPv4Address, IIPv4AddressItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "ip-v4-address")));
+  private static final IPAddressStringParameters IP_V_4;
+
+  static {
+    IP_V_4 = new IPAddressStringParameters.Builder()
+        .allowIPv6(false)
+        .allowEmpty(false)
+        .allowSingleSegment(false)
+        .allowWildcardedSeparator(false)
+        .getIPv4AddressParametersBuilder()
+        .allowBinary(false)
+        .allowLeadingZeros(false)
+        .allowPrefixesBeyondAddressSize(false)
+        .getParentBuilder()
+        .toParams();
+  }
+
+  IPv4AddressAdapter() {
+    super(IPv4Address.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public JsonFormatTypes getJsonRawType() {
+    return JsonFormatTypes.STRING;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public IPv4Address parse(String value) {
+    try {
+      return (IPv4Address) new IPAddressString(value, IP_V_4).toAddress();
+    } catch (AddressStringException | IncompatibleAddressException ex) {
+      throw new IllegalArgumentException(ex.getLocalizedMessage(), ex);
+    }
+  }
+
+  @Override
+  public IPv4Address copy(Object obj) {
+    // value is immutable
+    return (IPv4Address) obj;
+  }
+
+  @Override
+  public Class<IIPv4AddressItem> getItemClass() {
+    return IIPv4AddressItem.class;
+  }
+
+  @Override
+  public IIPv4AddressItem newItem(Object value) {
+    IPv4Address item = toValue(value);
+    return IIPv4AddressItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv6AddressAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv6AddressAdapter.java
index 05ba1bbca..a09300569 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv6AddressAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IPv6AddressAdapter.java
@@ -1,97 +1,100 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPv6AddressItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import inet.ipaddr.AddressStringException;
-import inet.ipaddr.IPAddressString;
-import inet.ipaddr.IPAddressStringParameters;
-import inet.ipaddr.IncompatibleAddressException;
-import inet.ipaddr.ipv6.IPv6Address;
-
-public class IPv6AddressAdapter
-    extends AbstractDataTypeAdapter<IPv6Address, IIPv6AddressItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("ip-v6-address"));
-  private static final IPAddressStringParameters IP_V_6;
-
-  static {
-    IP_V_6 = new IPAddressStringParameters.Builder().allowIPv4(false).allowEmpty(false).allowSingleSegment(false)
-        .allowWildcardedSeparator(false).getIPv6AddressParametersBuilder().allowBinary(false)
-        .allowPrefixesBeyondAddressSize(false).getParentBuilder().toParams();
-  }
-
-  IPv6AddressAdapter() {
-    super(IPv6Address.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public JsonFormatTypes getJsonRawType() {
-    return JsonFormatTypes.STRING;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public IPv6Address parse(String value) {
-    try {
-      return (IPv6Address) new IPAddressString(value, IP_V_6).toAddress();
-    } catch (AddressStringException | IncompatibleAddressException ex) {
-      throw new IllegalArgumentException(ex.getLocalizedMessage(), ex);
-    }
-  }
-
-  @Override
-  public IPv6Address copy(Object obj) {
-    // value is immutable
-    return (IPv6Address) obj;
-  }
-
-  @Override
-  public Class<IIPv6AddressItem> getItemClass() {
-    return IIPv6AddressItem.class;
-  }
-
-  @Override
-  public IIPv6AddressItem newItem(Object value) {
-    IPv6Address item = toValue(value);
-    return IIPv6AddressItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPv6AddressItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import inet.ipaddr.AddressStringException;
+import inet.ipaddr.IPAddressString;
+import inet.ipaddr.IPAddressStringParameters;
+import inet.ipaddr.IncompatibleAddressException;
+import inet.ipaddr.ipv6.IPv6Address;
+
+public class IPv6AddressAdapter
+    extends AbstractDataTypeAdapter<IPv6Address, IIPv6AddressItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "ip-v6-address")));
+  private static final IPAddressStringParameters IP_V_6;
+
+  static {
+    IP_V_6 = new IPAddressStringParameters.Builder().allowIPv4(false).allowEmpty(false).allowSingleSegment(false)
+        .allowWildcardedSeparator(false).getIPv6AddressParametersBuilder().allowBinary(false)
+        .allowPrefixesBeyondAddressSize(false).getParentBuilder().toParams();
+  }
+
+  IPv6AddressAdapter() {
+    super(IPv6Address.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public JsonFormatTypes getJsonRawType() {
+    return JsonFormatTypes.STRING;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public IPv6Address parse(String value) {
+    try {
+      return (IPv6Address) new IPAddressString(value, IP_V_6).toAddress();
+    } catch (AddressStringException | IncompatibleAddressException ex) {
+      throw new IllegalArgumentException(ex.getLocalizedMessage(), ex);
+    }
+  }
+
+  @Override
+  public IPv6Address copy(Object obj) {
+    // value is immutable
+    return (IPv6Address) obj;
+  }
+
+  @Override
+  public Class<IIPv6AddressItem> getItemClass() {
+    return IIPv6AddressItem.class;
+  }
+
+  @Override
+  public IIPv6AddressItem newItem(Object value) {
+    IPv6Address item = toValue(value);
+    return IIPv6AddressItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IntegerAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IntegerAdapter.java
index 2e0684092..02973460d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IntegerAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/IntegerAdapter.java
@@ -1,79 +1,82 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.math.BigInteger;
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class IntegerAdapter
-    extends AbstractIntegerAdapter<IIntegerItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("integer"));
-
-  IntegerAdapter() {
-    // avoid general construction
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public @NonNull Class<IIntegerItem> getItemClass() {
-    return IIntegerItem.class;
-  }
-
-  @Override
-  public IIntegerItem newItem(Object value) {
-    BigInteger item = toValue(value);
-    return IIntegerItem.valueOf(item);
-  }
-
-  @Override
-  protected IIntegerItem castInternal(@NonNull IAnyAtomicItem item) {
-    IIntegerItem retval;
-    if (item instanceof INumericItem) {
-      retval = newItem(((INumericItem) item).asInteger());
-    } else if (item instanceof IBooleanItem) {
-      boolean value = ((IBooleanItem) item).toBoolean();
-      retval = newItem(ObjectUtils.notNull(value ? BigInteger.ONE : BigInteger.ZERO));
-    } else {
-      retval = super.castInternal(item);
-    }
-    return retval;
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.math.BigInteger;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class IntegerAdapter
+    extends AbstractIntegerAdapter<IIntegerItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "integer")));
+
+  IntegerAdapter() {
+    // avoid general construction
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public @NonNull Class<IIntegerItem> getItemClass() {
+    return IIntegerItem.class;
+  }
+
+  @Override
+  public IIntegerItem newItem(Object value) {
+    BigInteger item = toValue(value);
+    return IIntegerItem.valueOf(item);
+  }
+
+  @Override
+  protected IIntegerItem castInternal(@NonNull IAnyAtomicItem item) {
+    IIntegerItem retval;
+    if (item instanceof INumericItem) {
+      retval = newItem(((INumericItem) item).asInteger());
+    } else if (item instanceof IBooleanItem) {
+      boolean value = ((IBooleanItem) item).toBoolean();
+      retval = newItem(ObjectUtils.notNull(value ? BigInteger.ONE : BigInteger.ZERO));
+    } else {
+      retval = super.castInternal(item);
+    }
+    return retval;
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NcNameAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NcNameAdapter.java
index 4cb7365a6..4a6c99d26 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NcNameAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NcNameAdapter.java
@@ -1,64 +1,67 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.INcNameItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-@Deprecated(forRemoval = true, since = "0.7.0")
-public class NcNameAdapter
-    extends AbstractStringAdapter<INcNameItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("ncname",
-          // for backwards compatibility with original type name
-          "NCName"));
-
-  NcNameAdapter() {
-    // avoid general construction
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public Class<INcNameItem> getItemClass() {
-    return INcNameItem.class;
-  }
-
-  @Override
-  public INcNameItem newItem(Object value) {
-    String item = asString(value);
-    return INcNameItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.INcNameItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+@Deprecated(forRemoval = true, since = "0.7.0")
+public class NcNameAdapter
+    extends AbstractStringAdapter<INcNameItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "ncname"),
+          // for backwards compatibility with original type name
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "NCName")));
+
+  NcNameAdapter() {
+    // avoid general construction
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public Class<INcNameItem> getItemClass() {
+    return INcNameItem.class;
+  }
+
+  @Override
+  public INcNameItem newItem(Object value) {
+    String item = asString(value);
+    return INcNameItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java
index 72648415a..23af3d9e3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java
@@ -1,65 +1,68 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.INonNegativeIntegerItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.math.BigInteger;
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class NonNegativeIntegerAdapter
-    extends AbstractIntegerAdapter<INonNegativeIntegerItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of(
-          "non-negative-integer",
-          // for backwards compatibility with original type name
-          "nonNegativeInteger"));
-
-  NonNegativeIntegerAdapter() {
-    // avoid general construction
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public Class<INonNegativeIntegerItem> getItemClass() {
-    return INonNegativeIntegerItem.class;
-  }
-
-  @Override
-  public INonNegativeIntegerItem newItem(Object value) {
-    BigInteger item = toValue(value);
-    return INonNegativeIntegerItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.INonNegativeIntegerItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.math.BigInteger;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class NonNegativeIntegerAdapter
+    extends AbstractIntegerAdapter<INonNegativeIntegerItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "non-negative-integer"),
+          // for backwards compatibility with original type name
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "nonNegativeInteger")));
+
+  NonNegativeIntegerAdapter() {
+    // avoid general construction
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public Class<INonNegativeIntegerItem> getItemClass() {
+    return INonNegativeIntegerItem.class;
+  }
+
+  @Override
+  public INonNegativeIntegerItem newItem(Object value) {
+    BigInteger item = toValue(value);
+    return INonNegativeIntegerItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java
index 8e9aad093..3eb2f949d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java
@@ -1,65 +1,68 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IPositiveIntegerItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.math.BigInteger;
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class PositiveIntegerAdapter
-    extends AbstractIntegerAdapter<IPositiveIntegerItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of(
-          "positive-integer",
-          // for backwards compatibility with original type name
-          "positiveInteger"));
-
-  PositiveIntegerAdapter() {
-    // avoid general construction
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public Class<IPositiveIntegerItem> getItemClass() {
-    return IPositiveIntegerItem.class;
-  }
-
-  @Override
-  public IPositiveIntegerItem newItem(Object value) {
-    BigInteger item = toValue(value);
-    return IPositiveIntegerItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IPositiveIntegerItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.math.BigInteger;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class PositiveIntegerAdapter
+    extends AbstractIntegerAdapter<IPositiveIntegerItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "positive-integer"),
+          // for backwards compatibility with original type name
+          new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "positiveInteger")));
+
+  PositiveIntegerAdapter() {
+    // avoid general construction
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public Class<IPositiveIntegerItem> getItemClass() {
+    return IPositiveIntegerItem.class;
+  }
+
+  @Override
+  public IPositiveIntegerItem newItem(Object value) {
+    BigInteger item = toValue(value);
+    return IPositiveIntegerItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/StringAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/StringAdapter.java
index 6d58c700b..e2810e229 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/StringAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/StringAdapter.java
@@ -1,61 +1,64 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class StringAdapter
-    extends AbstractStringAdapter<IStringItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("string"));
-
-  StringAdapter() {
-    // avoid general construction
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public Class<IStringItem> getItemClass() {
-    return IStringItem.class;
-  }
-
-  @Override
-  public @NonNull IStringItem newItem(@NonNull Object value) {
-    String item = asString(value);
-    return IStringItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class StringAdapter
+    extends AbstractStringAdapter<IStringItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "string")));
+
+  StringAdapter() {
+    // avoid general construction
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public Class<IStringItem> getItemClass() {
+    return IStringItem.class;
+  }
+
+  @Override
+  public @NonNull IStringItem newItem(@NonNull Object value) {
+    String item = asString(value);
+    return IStringItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TokenAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TokenAdapter.java
index 327edfe7a..5136d297c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TokenAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/TokenAdapter.java
@@ -26,25 +26,28 @@
 
 package gov.nist.secauto.metaschema.core.datatype.adapter;
 
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITokenItem;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class TokenAdapter
     extends AbstractStringAdapter<ITokenItem> {
   @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("token"));
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "token")));
 
   TokenAdapter() {
     // avoid general construction
   }
 
   @Override
-  public List<String> getNames() {
+  public List<QName> getNames() {
     return NAMES;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriAdapter.java
index fbfa746ad..f1bb35083 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriAdapter.java
@@ -1,83 +1,86 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.net.URI;
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class UriAdapter
-    extends AbstractDataTypeAdapter<URI, IAnyUriItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("uri"));
-
-  UriAdapter() {
-    super(URI.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public JsonFormatTypes getJsonRawType() {
-    return JsonFormatTypes.STRING;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public URI parse(String value) {
-    return URI.create(value);
-  }
-
-  @Override
-  public URI copy(Object obj) {
-    // a URI is immutable
-    return (URI) obj;
-  }
-
-  @Override
-  public Class<IAnyUriItem> getItemClass() {
-    return IAnyUriItem.class;
-  }
-
-  @Override
-  public IAnyUriItem newItem(Object value) {
-    URI item = toValue(value);
-    return IAnyUriItem.valueOf(item);
-  }
-
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.net.URI;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class UriAdapter
+    extends AbstractDataTypeAdapter<URI, IAnyUriItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "uri")));
+
+  UriAdapter() {
+    super(URI.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public JsonFormatTypes getJsonRawType() {
+    return JsonFormatTypes.STRING;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public URI parse(String value) {
+    return URI.create(value);
+  }
+
+  @Override
+  public URI copy(Object obj) {
+    // a URI is immutable
+    return (URI) obj;
+  }
+
+  @Override
+  public Class<IAnyUriItem> getItemClass() {
+    return IAnyUriItem.class;
+  }
+
+  @Override
+  public IAnyUriItem newItem(Object value) {
+    URI item = toValue(value);
+    return IAnyUriItem.valueOf(item);
+  }
+
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriReferenceAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriReferenceAdapter.java
index e17f4d58b..2e3015bcc 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriReferenceAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UriReferenceAdapter.java
@@ -1,82 +1,85 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.adapter;
-
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-
-import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUriReferenceItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.net.URI;
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class UriReferenceAdapter
-    extends AbstractDataTypeAdapter<URI, IUriReferenceItem> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("uri-reference"));
-
-  UriReferenceAdapter() {
-    super(URI.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public JsonFormatTypes getJsonRawType() {
-    return JsonFormatTypes.STRING;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public URI parse(String value) {
-    return URI.create(value);
-  }
-
-  @Override
-  public URI copy(Object obj) {
-    // a URI is immutable
-    return (URI) obj;
-  }
-
-  @Override
-  public Class<IUriReferenceItem> getItemClass() {
-    return IUriReferenceItem.class;
-  }
-
-  @Override
-  public IUriReferenceItem newItem(Object value) {
-    URI item = toValue(value);
-    return IUriReferenceItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.adapter;
+
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+
+import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUriReferenceItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.net.URI;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class UriReferenceAdapter
+    extends AbstractDataTypeAdapter<URI, IUriReferenceItem> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "uri-reference")));
+
+  UriReferenceAdapter() {
+    super(URI.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public JsonFormatTypes getJsonRawType() {
+    return JsonFormatTypes.STRING;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public URI parse(String value) {
+    return URI.create(value);
+  }
+
+  @Override
+  public URI copy(Object obj) {
+    // a URI is immutable
+    return (URI) obj;
+  }
+
+  @Override
+  public Class<IUriReferenceItem> getItemClass() {
+    return IUriReferenceItem.class;
+  }
+
+  @Override
+  public IUriReferenceItem newItem(Object value) {
+    URI item = toValue(value);
+    return IUriReferenceItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UuidAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UuidAdapter.java
index fda5a1234..7338723b5 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UuidAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/UuidAdapter.java
@@ -29,6 +29,7 @@
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
 
 import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUuidItem;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -36,13 +37,15 @@
 import java.util.UUID;
 import java.util.regex.Pattern;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class UuidAdapter
     extends AbstractDataTypeAdapter<UUID, IUuidItem> {
   @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("uuid"));
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "uuid")));
   public static final Pattern UUID_PATTERN
       = Pattern.compile("^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$");
 
@@ -51,7 +54,7 @@ public class UuidAdapter
   }
 
   @Override
-  public List<String> getNames() {
+  public List<QName> getNames() {
     return NAMES;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/YearMonthAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/YearMonthAdapter.java
index 0d9190696..b1fcff918 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/YearMonthAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/YearMonthAdapter.java
@@ -29,6 +29,7 @@
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
 
 import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -36,20 +37,22 @@
 import java.time.format.DateTimeParseException;
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class YearMonthAdapter
     extends AbstractDataTypeAdapter<Period, IYearMonthDurationItem> {
   @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("year-month-duration"));
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "year-month-duration")));
 
   YearMonthAdapter() {
     super(Period.class);
   }
 
   @Override
-  public List<String> getNames() {
+  public List<QName> getNames() {
     return NAMES;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/AbstractMarkupString.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/AbstractMarkupString.java
index 667e292af..bef3a08e7 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/AbstractMarkupString.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/AbstractMarkupString.java
@@ -1,300 +1,300 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.markup;
-
-import com.ctc.wstx.api.WstxOutputProperties;
-import com.ctc.wstx.stax.WstxOutputFactory;
-import com.vladsch.flexmark.formatter.Formatter;
-import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
-import com.vladsch.flexmark.parser.Parser;
-import com.vladsch.flexmark.util.ast.Document;
-import com.vladsch.flexmark.util.ast.Node;
-
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.AstCollectingVisitor;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkFactory;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.IMarkupVisitor;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.IMarkupWriter;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertVisitor;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.MarkupVisitor;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.MarkupXmlEventWriter;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.MarkupXmlStreamWriter;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.codehaus.stax2.XMLOutputFactory2;
-import org.codehaus.stax2.XMLStreamWriter2;
-import org.codehaus.stax2.evt.XMLEventFactory2;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.TextNode;
-import org.jsoup.select.NodeTraversor;
-import org.jsoup.select.NodeVisitor;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
-@SuppressWarnings("PMD.CouplingBetweenObjects")
-public abstract class AbstractMarkupString<TYPE extends AbstractMarkupString<TYPE>>
-    implements IMarkupString<TYPE> {
-  private static final Logger LOGGER = LogManager.getLogger(FlexmarkFactory.class);
-
-  private static final Pattern QUOTE_TAG_REPLACEMENT_PATTERN
-      = Pattern.compile("</?q>");
-
-  //
-  // @NonNull
-  // private static final String DEFAULT_HTML_NS = "http://www.w3.org/1999/xhtml";
-  // @NonNull
-  // private static final String DEFAULT_HTML_PREFIX = "";
-
-  @NonNull
-  private final Document document;
-
-  /**
-   * Construct a new markup string based on the provided flexmark AST graph.
-   *
-   * @param document
-   *          the AST graph representing Markdown text
-   */
-  protected AbstractMarkupString(@NonNull Document document) {
-    this.document = document;
-  }
-
-  @Override
-  public Document getDocument() {
-    return document;
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return getDocument().getFirstChild() == null;
-  }
-
-  /**
-   * Parse HTML-based text into markdown as a flexmark AST graph.
-   * <p>
-   * This method uses a two-step approach that first translates the HTML into
-   * markdown, and then parses the markdown into an AST graph.
-   *
-   * @param html
-   *          the HTML text to parse
-   * @param htmlParser
-   *          the HTML parser used to produce markdown
-   * @param markdownParser
-   *          the markdown parser
-   * @return the markdown AST graph
-   */
-  @NonNull
-  protected static Document parseHtml(@NonNull String html, @NonNull FlexmarkHtmlConverter htmlParser,
-      @NonNull Parser markdownParser) {
-    org.jsoup.nodes.Document document = Jsoup.parse(html);
-
-    // Fix for usnistgov/liboscal-java#5
-    // Caused by not stripping out extra newlines inside HTML tags
-    NodeTraversor.traverse(new NodeVisitor() {
-
-      @Override
-      public void head(org.jsoup.nodes.Node node, int depth) {
-        if (node instanceof TextNode) {
-          TextNode textNode = (TextNode) node;
-
-          org.jsoup.nodes.Node parent = textNode.parent();
-
-          if (!isTag(parent, "code") || !isTag(parent.parent(), "pre")) {
-            node.replaceWith(new TextNode(textNode.text()));
-          }
-        }
-      }
-
-      private boolean isTag(@Nullable org.jsoup.nodes.Node node, @NonNull String tagName) {
-        return node != null && tagName.equals(node.normalName());
-      }
-
-    }, document);
-
-    String markdown = htmlParser.convert(document);
-    assert markdown != null;
-    if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("html->markdown: {}", markdown);
-    }
-    return parseMarkdown(markdown, markdownParser);
-  }
-
-  /**
-   * Parse markdown-based text into a flexmark AST graph.
-   *
-   * @param markdown
-   *          the markdown text to parse
-   * @param parser
-   *          the markdown parser
-   * @return the markdown AST graph
-   */
-  @SuppressWarnings("null")
-  @NonNull
-  protected static Document parseMarkdown(@NonNull String markdown, @NonNull Parser parser) {
-    return parser.parse(markdown);
-  }
-
-  @Override
-  public String toXHtml(@NonNull String namespace) throws XMLStreamException, IOException {
-
-    String retval;
-
-    Document document = getDocument();
-    if (document.hasChildren()) {
-
-      XMLOutputFactory2 factory = (XMLOutputFactory2) XMLOutputFactory.newInstance();
-      assert factory instanceof WstxOutputFactory;
-      factory.setProperty(WstxOutputProperties.P_OUTPUT_VALIDATE_STRUCTURE, false);
-      try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
-        XMLStreamWriter2 xmlStreamWriter = (XMLStreamWriter2) factory.createXMLStreamWriter(os);
-
-        writeXHtml(namespace, ObjectUtils.notNull(xmlStreamWriter));
-
-        xmlStreamWriter.flush();
-        xmlStreamWriter.close();
-        os.flush();
-        retval = ObjectUtils.notNull(os.toString(StandardCharsets.UTF_8));
-      }
-    } else {
-      retval = "";
-    }
-    return retval;
-  }
-
-  @Override
-  public String toHtml() {
-    // String html;
-    // try {
-    // html = toXHtml("");
-    // } catch(RuntimeException ex) {
-    // throw ex;
-    // } catch (Throwable ex) {
-    // throw new RuntimeException(ex);
-    // }
-    // return QUOTE_TAG_REPLACEMENT_PATTERN.matcher(html)
-    // .replaceAll("&quot;");
-    String html = getFlexmarkFactory().getHtmlRenderer().render(getDocument());
-    return ObjectUtils.notNull(QUOTE_TAG_REPLACEMENT_PATTERN.matcher(html)
-        .replaceAll("&quot;"));
-  }
-
-  @Override
-  public String toMarkdown() {
-    return toMarkdown(getFlexmarkFactory().getFormatter());
-  }
-
-  @Override
-  public String toMarkdown(Formatter formatter) {
-    return ObjectUtils.notNull(formatter.render(getDocument()));
-  }
-
-  @Override
-  public void writeXHtml(String namespace, XMLStreamWriter2 streamWriter) throws XMLStreamException {
-    Document document = getDocument();
-    if (document.hasChildren()) {
-      IMarkupWriter<XMLStreamWriter, XMLStreamException> writer = new MarkupXmlStreamWriter(
-          namespace,
-          getFlexmarkFactory().getListOptions(),
-          streamWriter);
-
-      IMarkupVisitor<XMLStreamWriter, XMLStreamException> visitor = new MarkupVisitor<>(isBlock());
-      visitor.visitDocument(document, writer);
-    } else {
-      streamWriter.writeCharacters("");
-    }
-  }
-
-  @Override
-  public void writeXHtml(String namespace, XMLEventFactory2 eventFactory, XMLEventWriter eventWriter)
-      throws XMLStreamException {
-    Document document = getDocument();
-    if (document.hasChildren()) {
-
-      IMarkupWriter<XMLEventWriter, XMLStreamException> writer = new MarkupXmlEventWriter(
-          namespace,
-          getFlexmarkFactory().getListOptions(),
-          eventWriter,
-          eventFactory);
-
-      IMarkupVisitor<XMLEventWriter, XMLStreamException> visitor = new MarkupVisitor<>(isBlock());
-      visitor.visitDocument(getDocument(), writer);
-    } else {
-      eventWriter.add(eventFactory.createSpace(""));
-    }
-
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public Stream<Node> getNodesAsStream() {
-    return Stream.concat(Stream.of(getDocument()),
-        StreamSupport.stream(getDocument().getDescendants().spliterator(), false));
-  }
-
-  @Override
-  @NonNull
-  public List<InsertAnchorNode> getInserts() {
-    return getInserts(insert -> true);
-  }
-
-  /**
-   * Retrieve all insert statements that are contained within this markup text
-   * that match the provided filter.
-   *
-   * @param filter
-   *          a filter used to identify matching insert statements
-   * @return the matching insert statements
-   */
-  @Override
-  @NonNull
-  public List<InsertAnchorNode> getInserts(@NonNull Predicate<InsertAnchorNode> filter) {
-    InsertVisitor visitor = new InsertVisitor(filter);
-    visitor.visitChildren(getDocument());
-    return visitor.getInserts();
-  }
-
-  @Override
-  public String toString() {
-    return AstCollectingVisitor.asString(getDocument());
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.markup;
+
+import com.ctc.wstx.api.WstxOutputProperties;
+import com.ctc.wstx.stax.WstxOutputFactory;
+import com.vladsch.flexmark.formatter.Formatter;
+import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
+import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.util.ast.Document;
+import com.vladsch.flexmark.util.ast.Node;
+
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.AstCollectingVisitor;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkFactory;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.IMarkupVisitor;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.IMarkupWriter;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.MarkupVisitor;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.MarkupXmlEventWriter;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.MarkupXmlStreamWriter;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.codehaus.stax2.XMLOutputFactory2;
+import org.codehaus.stax2.XMLStreamWriter2;
+import org.codehaus.stax2.evt.XMLEventFactory2;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.TextNode;
+import org.jsoup.select.NodeTraversor;
+import org.jsoup.select.NodeVisitor;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+@SuppressWarnings("PMD.CouplingBetweenObjects")
+public abstract class AbstractMarkupString<TYPE extends AbstractMarkupString<TYPE>>
+    implements IMarkupString<TYPE> {
+  private static final Logger LOGGER = LogManager.getLogger(FlexmarkFactory.class);
+
+  private static final Pattern QUOTE_TAG_REPLACEMENT_PATTERN
+      = Pattern.compile("</?q>");
+
+  //
+  // @NonNull
+  // private static final String DEFAULT_HTML_NS = "http://www.w3.org/1999/xhtml";
+  // @NonNull
+  // private static final String DEFAULT_HTML_PREFIX = "";
+
+  @NonNull
+  private final Document document;
+
+  /**
+   * Construct a new markup string based on the provided flexmark AST graph.
+   *
+   * @param document
+   *          the AST graph representing Markdown text
+   */
+  protected AbstractMarkupString(@NonNull Document document) {
+    this.document = document;
+  }
+
+  @Override
+  public Document getDocument() {
+    return document;
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return getDocument().getFirstChild() == null;
+  }
+
+  /**
+   * Parse HTML-based text into markdown as a flexmark AST graph.
+   * <p>
+   * This method uses a two-step approach that first translates the HTML into
+   * markdown, and then parses the markdown into an AST graph.
+   *
+   * @param html
+   *          the HTML text to parse
+   * @param htmlParser
+   *          the HTML parser used to produce markdown
+   * @param markdownParser
+   *          the markdown parser
+   * @return the markdown AST graph
+   */
+  @NonNull
+  protected static Document parseHtml(@NonNull String html, @NonNull FlexmarkHtmlConverter htmlParser,
+      @NonNull Parser markdownParser) {
+    org.jsoup.nodes.Document document = Jsoup.parse(html);
+
+    // Fix for usnistgov/liboscal-java#5
+    // Caused by not stripping out extra newlines inside HTML tags
+    NodeTraversor.traverse(new NodeVisitor() {
+
+      @Override
+      public void head(org.jsoup.nodes.Node node, int depth) {
+        if (node instanceof TextNode) {
+          TextNode textNode = (TextNode) node;
+
+          org.jsoup.nodes.Node parent = textNode.parent();
+
+          if (!isTag(parent, "code") || !isTag(parent.parent(), "pre")) {
+            node.replaceWith(new TextNode(textNode.text()));
+          }
+        }
+      }
+
+      private boolean isTag(@Nullable org.jsoup.nodes.Node node, @NonNull String tagName) {
+        return node != null && tagName.equals(node.normalName());
+      }
+
+    }, document);
+
+    String markdown = htmlParser.convert(document);
+    assert markdown != null;
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("html->markdown: {}", markdown);
+    }
+    return parseMarkdown(markdown, markdownParser);
+  }
+
+  /**
+   * Parse markdown-based text into a flexmark AST graph.
+   *
+   * @param markdown
+   *          the markdown text to parse
+   * @param parser
+   *          the markdown parser
+   * @return the markdown AST graph
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  protected static Document parseMarkdown(@NonNull String markdown, @NonNull Parser parser) {
+    return parser.parse(markdown);
+  }
+
+  @Override
+  public String toXHtml(@NonNull String namespace) throws XMLStreamException, IOException {
+
+    String retval;
+
+    Document document = getDocument();
+    if (document.hasChildren()) {
+
+      XMLOutputFactory2 factory = (XMLOutputFactory2) XMLOutputFactory.newInstance();
+      assert factory instanceof WstxOutputFactory;
+      factory.setProperty(WstxOutputProperties.P_OUTPUT_VALIDATE_STRUCTURE, false);
+      try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+        XMLStreamWriter2 xmlStreamWriter = (XMLStreamWriter2) factory.createXMLStreamWriter(os);
+
+        writeXHtml(namespace, ObjectUtils.notNull(xmlStreamWriter));
+
+        xmlStreamWriter.flush();
+        xmlStreamWriter.close();
+        os.flush();
+        retval = ObjectUtils.notNull(os.toString(StandardCharsets.UTF_8));
+      }
+    } else {
+      retval = "";
+    }
+    return retval;
+  }
+
+  @Override
+  public String toHtml() {
+    // String html;
+    // try {
+    // html = toXHtml("");
+    // } catch(RuntimeException ex) {
+    // throw ex;
+    // } catch (Throwable ex) {
+    // throw new RuntimeException(ex);
+    // }
+    // return QUOTE_TAG_REPLACEMENT_PATTERN.matcher(html)
+    // .replaceAll("&quot;");
+    String html = getFlexmarkFactory().getHtmlRenderer().render(getDocument());
+    return ObjectUtils.notNull(QUOTE_TAG_REPLACEMENT_PATTERN.matcher(html)
+        .replaceAll("&quot;"));
+  }
+
+  @Override
+  public String toMarkdown() {
+    return toMarkdown(getFlexmarkFactory().getFormatter());
+  }
+
+  @Override
+  public String toMarkdown(Formatter formatter) {
+    return ObjectUtils.notNull(formatter.render(getDocument()));
+  }
+
+  @Override
+  public void writeXHtml(String namespace, XMLStreamWriter2 streamWriter) throws XMLStreamException {
+    Document document = getDocument();
+    if (document.hasChildren()) {
+      IMarkupWriter<XMLStreamWriter, XMLStreamException> writer = new MarkupXmlStreamWriter(
+          namespace,
+          getFlexmarkFactory().getListOptions(),
+          streamWriter);
+
+      IMarkupVisitor<XMLStreamWriter, XMLStreamException> visitor = new MarkupVisitor<>(isBlock());
+      visitor.visitDocument(document, writer);
+    } else {
+      streamWriter.writeCharacters("");
+    }
+  }
+
+  @Override
+  public void writeXHtml(String namespace, XMLEventFactory2 eventFactory, XMLEventWriter eventWriter)
+      throws XMLStreamException {
+    Document document = getDocument();
+    if (document.hasChildren()) {
+
+      IMarkupWriter<XMLEventWriter, XMLStreamException> writer = new MarkupXmlEventWriter(
+          namespace,
+          getFlexmarkFactory().getListOptions(),
+          eventWriter,
+          eventFactory);
+
+      IMarkupVisitor<XMLEventWriter, XMLStreamException> visitor = new MarkupVisitor<>(isBlock());
+      visitor.visitDocument(getDocument(), writer);
+    } else {
+      eventWriter.add(eventFactory.createSpace(""));
+    }
+
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public Stream<Node> getNodesAsStream() {
+    return Stream.concat(Stream.of(getDocument()),
+        StreamSupport.stream(getDocument().getDescendants().spliterator(), false));
+  }
+
+  @Override
+  @NonNull
+  public List<InsertAnchorNode> getInserts() {
+    return getInserts(insert -> true);
+  }
+
+  /**
+   * Retrieve all insert statements that are contained within this markup text
+   * that match the provided filter.
+   *
+   * @param filter
+   *          a filter used to identify matching insert statements
+   * @return the matching insert statements
+   */
+  @Override
+  @NonNull
+  public List<InsertAnchorNode> getInserts(@NonNull Predicate<InsertAnchorNode> filter) {
+    InsertAnchorExtension.InsertVisitor visitor = new InsertAnchorExtension.InsertVisitor(filter);
+    visitor.visitChildren(getDocument());
+    return visitor.getInserts();
+  }
+
+  @Override
+  public String toString() {
+    return AstCollectingVisitor.asString(getDocument());
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/IMarkupString.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/IMarkupString.java
index a2d162b56..9e97a1236 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/IMarkupString.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/IMarkupString.java
@@ -49,12 +49,27 @@
 
 public interface IMarkupString<TYPE extends IMarkupString<TYPE>>
     extends ICustomJavaDataType<TYPE> {
+  /**
+   * Get the underlying Flexmark factory supporting markup serialization.
+   *
+   * @return the factory
+   */
   @NonNull
   FlexmarkFactory getFlexmarkFactory();
 
+  /**
+   * Get the top-level Flexmark document node for the markup.
+   *
+   * @return the node
+   */
   @NonNull
   Document getDocument();
 
+  /**
+   * Determine if the markup has no contents.
+   *
+   * @return {@code true} if the markup has no contents or {@code false} otherwise
+   */
   boolean isEmpty();
 
   // /**
@@ -73,15 +88,49 @@ public interface IMarkupString<TYPE extends IMarkupString<TYPE>>
   // throws
   // XMLStreamException;
 
+  /**
+   * Get the HyperText Markup Language (HTML) representation of this markup
+   * string.
+   *
+   * @return the HTML
+   */
   @NonNull
   String toHtml();
 
+  /**
+   * Get the Extensible HyperText Markup Language (XHTML) representation of this
+   * markup string.
+   *
+   * @param namespace
+   *          the XML namespace to use for XHTML elements
+   *
+   * @return the XHTML
+   * @throws XMLStreamException
+   *           if an error occurred while establishing or writing to the
+   *           underlying XML stream
+   * @throws IOException
+   *           if an error occurred while generating the XHTML data
+   */
   @NonNull
   String toXHtml(@NonNull String namespace) throws XMLStreamException, IOException;
 
+  /**
+   * Get the Commonmark Markdown representation of this markup string.
+   *
+   * @return the Markdown
+   */
   @NonNull
   String toMarkdown();
 
+  /**
+   * Get a Markdown representation of this markup string, which will be created by
+   * the provided formatter.
+   *
+   * @param formatter
+   *          the specific Markdown formatter to use in producing the Markdown
+   *
+   * @return the Markdown
+   */
   @NonNull
   String toMarkdown(@NonNull Formatter formatter);
 
@@ -93,6 +142,11 @@ public interface IMarkupString<TYPE extends IMarkupString<TYPE>>
   @NonNull
   Stream<Node> getNodesAsStream();
 
+  /**
+   * Get markup inserts used as place holders within the string.
+   *
+   * @return a list of insets or an empty list if no inserts are present
+   */
   @NonNull
   default List<InsertAnchorNode> getInserts() {
     return getInserts(insert -> true);
@@ -118,10 +172,37 @@ List<InsertAnchorNode> getInserts(
    */
   boolean isBlock();
 
+  /**
+   * Write the Extensible HyperText Markup Language (XHTML) representation of this
+   * markup string to the provided stream writer.
+   *
+   * @param namespace
+   *          the XML namespace to use for XHTML elements
+   * @param streamWriter
+   *          the XML stream to write to
+   * @throws XMLStreamException
+   *           if an error occurred while establishing or writing to the XML
+   *           stream
+   */
   void writeXHtml(
       @NonNull String namespace,
       @NonNull XMLStreamWriter2 streamWriter) throws XMLStreamException;
 
+  /**
+   * Write the Extensible HyperText Markup Language (XHTML) representation of this
+   * markup string to the provided stream writer using the provided XML event
+   * factory.
+   *
+   * @param namespace
+   *          the XML namespace to use for XHTML elements
+   * @param eventFactory
+   *          the XML event factory used to generate XML events to write
+   * @param eventWriter
+   *          the XML event stream to write to
+   * @throws XMLStreamException
+   *           if an error occurred while establishing or writing to the XML
+   *           stream
+   */
   void writeXHtml(
       @NonNull String namespace,
       @NonNull XMLEventFactory2 eventFactory,
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLine.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLine.java
index 20772f991..eac3f871b 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLine.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLine.java
@@ -1,110 +1,130 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.markup;
-
-import com.vladsch.flexmark.html.HtmlRenderer;
-import com.vladsch.flexmark.parser.Parser;
-import com.vladsch.flexmark.util.ast.Block;
-import com.vladsch.flexmark.util.ast.Document;
-import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.data.DataSet;
-import com.vladsch.flexmark.util.data.MutableDataSet;
-import com.vladsch.flexmark.util.misc.Extension;
-
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkConfiguration;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkFactory;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.SuppressPTagExtension;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class MarkupLine
-    extends AbstractMarkupString<MarkupLine> {
-
-  @NonNull
-  private static final DataSet FLEXMARK_CONFIG = newParserOptions();
-
-  @NonNull
-  private static final FlexmarkFactory FLEXMARK_FACTORY = FlexmarkFactory.newInstance(FLEXMARK_CONFIG);
-
-  @SuppressWarnings("null")
-  @NonNull
-  protected static DataSet newParserOptions() {
-    MutableDataSet options = new MutableDataSet();
-    // disable inline HTML
-    options.set(Parser.HTML_BLOCK_PARSER, false);
-    // disable list processing
-    options.set(Parser.LIST_BLOCK_PARSER, false);
-    options.set(HtmlRenderer.SUPPRESS_HTML_BLOCKS, true);
-
-    Collection<Extension> currentExtensions = Parser.EXTENSIONS.get(FlexmarkConfiguration.FLEXMARK_CONFIG);
-    List<Extension> extensions = new LinkedList<>(currentExtensions);
-    extensions.add(SuppressPTagExtension.create());
-    Parser.EXTENSIONS.set(options, extensions);
-
-    return FlexmarkConfiguration.newFlexmarkConfig(options);
-  }
-
-  @NonNull
-  public static MarkupLine fromHtml(@NonNull String html) {
-    return new MarkupLine(
-        parseHtml(html, FLEXMARK_FACTORY.getFlexmarkHtmlConverter(), FLEXMARK_FACTORY.getMarkdownParser()));
-  }
-
-  @NonNull
-  public static MarkupLine fromMarkdown(@NonNull String markdown) {
-    return new MarkupLine(parseMarkdown(markdown, FLEXMARK_FACTORY.getMarkdownParser()));
-  }
-
-  @Override
-  public FlexmarkFactory getFlexmarkFactory() {
-    return FLEXMARK_FACTORY;
-  }
-
-  protected MarkupLine(@NonNull Document astNode) {
-    super(astNode);
-    Node child = astNode.getFirstChild();
-    if (child instanceof Block && child.getNext() != null) {
-      throw new IllegalStateException("multiple blocks not allowed");
-    } // else empty markdown
-  }
-
-  @Override
-  public MarkupLine copy() {
-    // TODO: find a way to do a deep copy
-    // this is a shallow copy that uses the same underlying Document object
-    return new MarkupLine(getDocument());
-  }
-
-  @Override
-  public boolean isBlock() {
-    return false;
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.markup;
+
+import com.vladsch.flexmark.html.HtmlRenderer;
+import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.util.ast.Block;
+import com.vladsch.flexmark.util.ast.Document;
+import com.vladsch.flexmark.util.ast.Node;
+import com.vladsch.flexmark.util.data.DataSet;
+import com.vladsch.flexmark.util.data.MutableDataSet;
+import com.vladsch.flexmark.util.misc.Extension;
+
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkConfiguration;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkFactory;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.SuppressPTagExtension;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class MarkupLine
+    extends AbstractMarkupString<MarkupLine> {
+
+  @NonNull
+  private static final DataSet FLEXMARK_CONFIG = newParserOptions();
+
+  @NonNull
+  private static final FlexmarkFactory FLEXMARK_FACTORY = FlexmarkFactory.newInstance(FLEXMARK_CONFIG);
+
+  @SuppressWarnings("null")
+  @NonNull
+  private static DataSet newParserOptions() {
+    MutableDataSet options = new MutableDataSet();
+    // disable inline HTML
+    options.set(Parser.HTML_BLOCK_PARSER, false);
+    // disable list processing
+    options.set(Parser.LIST_BLOCK_PARSER, false);
+    options.set(HtmlRenderer.SUPPRESS_HTML_BLOCKS, true);
+
+    Collection<Extension> currentExtensions = Parser.EXTENSIONS.get(FlexmarkConfiguration.FLEXMARK_CONFIG);
+    List<Extension> extensions = new LinkedList<>(currentExtensions);
+    extensions.add(SuppressPTagExtension.newInstance());
+    Parser.EXTENSIONS.set(options, extensions);
+
+    return FlexmarkConfiguration.newFlexmarkConfig(options);
+  }
+
+  /**
+   * Convert the provided HTML string into markup.
+   *
+   * @param html
+   *          the HTML
+   * @return the markup instance
+   */
+  @NonNull
+  public static MarkupLine fromHtml(@NonNull String html) {
+    return new MarkupLine(
+        parseHtml(html, FLEXMARK_FACTORY.getFlexmarkHtmlConverter(), FLEXMARK_FACTORY.getMarkdownParser()));
+  }
+
+  /**
+   * Convert the provided markdown string into markup.
+   *
+   * @param markdown
+   *          the markup
+   * @return the markup instance
+   */
+  @NonNull
+  public static MarkupLine fromMarkdown(@NonNull String markdown) {
+    return new MarkupLine(parseMarkdown(markdown, FLEXMARK_FACTORY.getMarkdownParser()));
+  }
+
+  @Override
+  public FlexmarkFactory getFlexmarkFactory() {
+    return FLEXMARK_FACTORY;
+  }
+
+  /**
+   * Construct a new single line markup instance.
+   *
+   * @param astNode
+   *          the parsed markup AST
+   */
+  protected MarkupLine(@NonNull Document astNode) {
+    super(astNode);
+    Node child = astNode.getFirstChild();
+    if (child instanceof Block && child.getNext() != null) {
+      throw new IllegalStateException("multiple blocks not allowed");
+    } // else empty markdown
+  }
+
+  @Override
+  public MarkupLine copy() {
+    // TODO: find a way to do a deep copy
+    // this is a shallow copy that uses the same underlying Document object
+    return new MarkupLine(getDocument());
+  }
+
+  @Override
+  public boolean isBlock() {
+    return false;
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLineAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLineAdapter.java
index b1dbdd58b..0e3d0b31a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLineAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupLineAdapter.java
@@ -1,100 +1,102 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.markup;
-
-import com.fasterxml.jackson.core.JsonParser;
-
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.XmlMarkupParser;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import org.codehaus.stax2.XMLEventReader2;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.xml.stream.XMLStreamException;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class MarkupLineAdapter
-    extends AbstractMarkupAdapter<MarkupLine> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("markup-line"));
-
-  MarkupLineAdapter() {
-    super(MarkupLine.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  /**
-   * Parse a line of Markdown.
-   */
-  @Override
-  public MarkupLine parse(String value) {
-    return MarkupLine.fromMarkdown(value);
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public MarkupLine parse(XMLEventReader2 eventReader) throws IOException {
-    try {
-      return XmlMarkupParser.instance().parseMarkupline(eventReader);
-    } catch (XMLStreamException ex) {
-      throw new IOException(ex);
-    }
-  }
-
-  @Override
-  public MarkupLine parse(JsonParser parser) throws IOException {
-    @SuppressWarnings("null") MarkupLine retval = parse(parser.getValueAsString());
-    // skip past value
-    parser.nextToken();
-    return retval;
-  }
-
-  @Override
-  public String getDefaultJsonValueKey() {
-    return "RICHTEXT";
-  }
-
-  @Override
-  public Class<IMarkupItem> getItemClass() {
-    return IMarkupItem.class;
-  }
-
-  @Override
-  public IMarkupItem newItem(Object value) {
-    MarkupLine item = toValue(value);
-    return IMarkupItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.markup;
+
+import com.fasterxml.jackson.core.JsonParser;
+
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.XmlMarkupParser;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import org.codehaus.stax2.XMLEventReader2;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class MarkupLineAdapter
+    extends AbstractMarkupAdapter<MarkupLine> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "markup-line")));
+
+  MarkupLineAdapter() {
+    super(MarkupLine.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  /**
+   * Parse a line of Markdown.
+   */
+  @Override
+  public MarkupLine parse(String value) {
+    return MarkupLine.fromMarkdown(value);
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public MarkupLine parse(XMLEventReader2 eventReader) throws IOException {
+    try {
+      return XmlMarkupParser.instance().parseMarkupline(eventReader);
+    } catch (XMLStreamException ex) {
+      throw new IOException(ex);
+    }
+  }
+
+  @Override
+  public MarkupLine parse(JsonParser parser) throws IOException {
+    @SuppressWarnings("null") MarkupLine retval = parse(parser.getValueAsString());
+    // skip past value
+    parser.nextToken();
+    return retval;
+  }
+
+  @Override
+  public String getDefaultJsonValueKey() {
+    return "RICHTEXT";
+  }
+
+  @Override
+  public Class<IMarkupItem> getItemClass() {
+    return IMarkupItem.class;
+  }
+
+  @Override
+  public IMarkupItem newItem(Object value) {
+    MarkupLine item = toValue(value);
+    return IMarkupItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultiline.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultiline.java
index 205b0ff35..dbcb2236b 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultiline.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultiline.java
@@ -1,96 +1,96 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.markup;
-
-import com.vladsch.flexmark.util.ast.Document;
-
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkFactory;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class MarkupMultiline
-    extends AbstractMarkupString<MarkupMultiline> {
-
-  @NonNull
-  private static final FlexmarkFactory FLEXMARK_FACTORY = FlexmarkFactory.instance();
-
-  /**
-   * Convert the provided HTML string into markup.
-   *
-   * @param html
-   *          the HTML
-   * @return the multiline markup instance
-   */
-  @NonNull
-  public static MarkupMultiline fromHtml(@NonNull String html) {
-    return new MarkupMultiline(
-        parseHtml(
-            html,
-            FLEXMARK_FACTORY.getFlexmarkHtmlConverter(),
-            FLEXMARK_FACTORY.getMarkdownParser()));
-  }
-
-  /**
-   * Convert the provided markdown string into markup.
-   *
-   * @param markdown
-   *          the markup
-   * @return the multiline markup instance
-   */
-  @NonNull
-  public static MarkupMultiline fromMarkdown(@NonNull String markdown) {
-    return new MarkupMultiline(
-        parseMarkdown(markdown, FLEXMARK_FACTORY.getMarkdownParser()));
-  }
-
-  /**
-   * Construct a new multiline markup instance.
-   *
-   * @param astNode
-   *          the parsed markup AST
-   */
-  public MarkupMultiline(@NonNull Document astNode) {
-    super(astNode);
-  }
-
-  @Override
-  public FlexmarkFactory getFlexmarkFactory() {
-    return FLEXMARK_FACTORY;
-  }
-
-  @Override
-  public MarkupMultiline copy() {
-    // TODO: find a way to do a deep copy
-    // this is a shallow copy that uses the same underlying Document object
-    return new MarkupMultiline(getDocument());
-  }
-
-  @Override
-  public boolean isBlock() {
-    return true;
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.markup;
+
+import com.vladsch.flexmark.util.ast.Document;
+
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.FlexmarkFactory;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class MarkupMultiline
+    extends AbstractMarkupString<MarkupMultiline> {
+
+  @NonNull
+  private static final FlexmarkFactory FLEXMARK_FACTORY = FlexmarkFactory.instance();
+
+  /**
+   * Convert the provided HTML string into markup.
+   *
+   * @param html
+   *          the HTML
+   * @return the markup instance
+   */
+  @NonNull
+  public static MarkupMultiline fromHtml(@NonNull String html) {
+    return new MarkupMultiline(
+        parseHtml(
+            html,
+            FLEXMARK_FACTORY.getFlexmarkHtmlConverter(),
+            FLEXMARK_FACTORY.getMarkdownParser()));
+  }
+
+  /**
+   * Convert the provided markdown string into markup.
+   *
+   * @param markdown
+   *          the markup
+   * @return the markup instance
+   */
+  @NonNull
+  public static MarkupMultiline fromMarkdown(@NonNull String markdown) {
+    return new MarkupMultiline(
+        parseMarkdown(markdown, FLEXMARK_FACTORY.getMarkdownParser()));
+  }
+
+  /**
+   * Construct a new multiline markup instance.
+   *
+   * @param astNode
+   *          the parsed markup AST
+   */
+  public MarkupMultiline(@NonNull Document astNode) {
+    super(astNode);
+  }
+
+  @Override
+  public FlexmarkFactory getFlexmarkFactory() {
+    return FLEXMARK_FACTORY;
+  }
+
+  @Override
+  public MarkupMultiline copy() {
+    // TODO: find a way to do a deep copy
+    // this is a shallow copy that uses the same underlying Document object
+    return new MarkupMultiline(getDocument());
+  }
+
+  @Override
+  public boolean isBlock() {
+    return true;
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultilineAdapter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultilineAdapter.java
index 3c907fa90..fee505840 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultilineAdapter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupMultilineAdapter.java
@@ -1,111 +1,112 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.markup;
-
-import com.fasterxml.jackson.core.JsonParser;
-
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.XmlMarkupParser;
-import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import org.codehaus.stax2.XMLEventReader2;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class MarkupMultilineAdapter
-    extends AbstractMarkupAdapter<MarkupMultiline> {
-  @NonNull
-  private static final List<String> NAMES = ObjectUtils.notNull(
-      List.of("markup-multiline"));
-
-  MarkupMultilineAdapter() {
-    super(MarkupMultiline.class);
-  }
-
-  @Override
-  public List<String> getNames() {
-    return NAMES;
-  }
-
-  @Override
-  public boolean isUnrappedValueAllowedInXml() {
-    return true;
-  }
-
-  /**
-   * Parse a line of Markdown.
-   */
-  @Override
-  public MarkupMultiline parse(String value) {
-    return MarkupMultiline.fromMarkdown(value);
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public MarkupMultiline parse(XMLEventReader2 eventReader) throws IOException {
-    try {
-      return XmlMarkupParser.instance().parseMarkupMultiline(eventReader);
-    } catch (XMLStreamException ex) {
-      throw new IOException(ex);
-    }
-  }
-
-  @Override
-  public MarkupMultiline parse(JsonParser parser) throws IOException {
-    @SuppressWarnings("null") MarkupMultiline retval = parse(parser.getValueAsString());
-    // skip past value
-    parser.nextToken();
-    return retval;
-  }
-
-  @Override
-  public boolean canHandleQName(QName nextQName) {
-    return true;
-  }
-
-  @Override
-  public String getDefaultJsonValueKey() {
-    return "PROSE";
-  }
-
-  @Override
-  public Class<IMarkupItem> getItemClass() {
-    return IMarkupItem.class;
-  }
-
-  @Override
-  public IMarkupItem newItem(Object value) {
-    MarkupMultiline item = toValue(value);
-    return IMarkupItem.valueOf(item);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.markup;
+
+import com.fasterxml.jackson.core.JsonParser;
+
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.XmlMarkupParser;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IMarkupItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import org.codehaus.stax2.XMLEventReader2;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class MarkupMultilineAdapter
+    extends AbstractMarkupAdapter<MarkupMultiline> {
+  @NonNull
+  private static final List<QName> NAMES = ObjectUtils.notNull(
+      List.of(new QName(MetapathConstants.NS_METAPATH.toASCIIString(), "markup-multiline")));
+
+  MarkupMultilineAdapter() {
+    super(MarkupMultiline.class);
+  }
+
+  @Override
+  public List<QName> getNames() {
+    return NAMES;
+  }
+
+  @Override
+  public boolean isUnrappedValueAllowedInXml() {
+    return true;
+  }
+
+  /**
+   * Parse a line of Markdown.
+   */
+  @Override
+  public MarkupMultiline parse(String value) {
+    return MarkupMultiline.fromMarkdown(value);
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public MarkupMultiline parse(XMLEventReader2 eventReader) throws IOException {
+    try {
+      return XmlMarkupParser.instance().parseMarkupMultiline(eventReader);
+    } catch (XMLStreamException ex) {
+      throw new IOException(ex);
+    }
+  }
+
+  @Override
+  public MarkupMultiline parse(JsonParser parser) throws IOException {
+    @SuppressWarnings("null") MarkupMultiline retval = parse(parser.getValueAsString());
+    // skip past value
+    parser.nextToken();
+    return retval;
+  }
+
+  @Override
+  public boolean canHandleQName(QName nextQName) {
+    return true;
+  }
+
+  @Override
+  public String getDefaultJsonValueKey() {
+    return "PROSE";
+  }
+
+  @Override
+  public Class<IMarkupItem> getItemClass() {
+    return IMarkupItem.class;
+  }
+
+  @Override
+  public IMarkupItem newItem(Object value) {
+    MarkupMultiline item = toValue(value);
+    return IMarkupItem.valueOf(item);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/AstCollectingVisitor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/AstCollectingVisitor.java
index 2d51a98e2..be57b01bc 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/AstCollectingVisitor.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/AstCollectingVisitor.java
@@ -1,88 +1,88 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.markup.flexmark;
-
-import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.ast.NodeVisitorBase;
-
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public final class AstCollectingVisitor
-    extends NodeVisitorBase {
-  public static final String EOL = "\n";
-
-  @SuppressWarnings("PMD.AvoidStringBufferField") // short lived
-  private final StringBuilder strBuilder;
-  private int indent; // 0;
-
-  private AstCollectingVisitor(@NonNull StringBuilder strBuilder) {
-    this.strBuilder = strBuilder;
-    indent = 0;
-  }
-
-  /**
-   * Generate a string representation of an AST.
-   *
-   * @param node
-   *          the branch of the tree to visualize
-   * @return the string representation of the AST.
-   */
-  @NonNull
-  public static String asString(@NonNull Node node) {
-    StringBuilder builder = new StringBuilder();
-    AstCollectingVisitor visitor = new AstCollectingVisitor(builder);
-    visitor.collect(node);
-    return ObjectUtils.notNull(builder.toString());
-  }
-
-  private void appendIndent() {
-    for (int i = 0; i < indent * 2; i++) {
-      strBuilder.append(' ');
-    }
-  }
-
-  private void collect(@NonNull Node node) {
-    visit(node);
-  }
-
-  @Override
-  protected void visit(Node node) {
-    assert node != null;
-    appendIndent();
-    node.astString(strBuilder, true);
-    strBuilder.append(EOL);
-    indent++;
-
-    try {
-      super.visitChildren(node);
-    } finally {
-      indent--;
-    }
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.markup.flexmark;
+
+import com.vladsch.flexmark.util.ast.Node;
+import com.vladsch.flexmark.util.ast.NodeVisitorBase;
+
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class AstCollectingVisitor
+    extends NodeVisitorBase {
+  public static final String EOL = "\n";
+
+  @SuppressWarnings("PMD.AvoidStringBufferField") // short lived
+  private final StringBuilder strBuilder;
+  private int indent; // 0;
+
+  private AstCollectingVisitor(@NonNull StringBuilder strBuilder) {
+    this.strBuilder = strBuilder;
+    indent = 0;
+  }
+
+  /**
+   * Generate a string representation of an AST.
+   *
+   * @param node
+   *          the branch of the tree to visualize
+   * @return the string representation of the AST.
+   */
+  @NonNull
+  public static String asString(@NonNull Node node) {
+    StringBuilder builder = new StringBuilder();
+    AstCollectingVisitor visitor = new AstCollectingVisitor(builder);
+    visitor.collect(node);
+    return ObjectUtils.notNull(builder.toString());
+  }
+
+  private void appendIndent() {
+    for (int i = 0; i < indent * 2; i++) {
+      strBuilder.append(' ');
+    }
+  }
+
+  private void collect(@NonNull Node node) {
+    visit(node);
+  }
+
+  @Override
+  protected void visit(Node node) {
+    assert node != null;
+    appendIndent();
+    node.astString(strBuilder, true);
+    strBuilder.append(EOL);
+    indent++;
+
+    try {
+      super.visitChildren(node);
+    } finally {
+      indent--;
+    }
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/FlexmarkConfiguration.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/FlexmarkConfiguration.java
index 7c1c4b005..2c8bf7310 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/FlexmarkConfiguration.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/FlexmarkConfiguration.java
@@ -65,13 +65,13 @@ private static DataSet initFlexmarkConfig() {
 
     List<Extension> extensions = List.of(
         // Metaschema insert
-        InsertAnchorExtension.create(),
+        InsertAnchorExtension.newInstance(),
         // q tag handling
-        HtmlQuoteTagExtension.create(),
+        HtmlQuoteTagExtension.newInstance(),
         TypographicExtension.create(),
         TablesExtension.create(),
         // fix for code handling
-        HtmlCodeRenderExtension.create(),
+        HtmlCodeRenderExtension.newInstance(),
         // to ensure that escaped characters are not lost
         EscapedCharacterExtension.create(),
         SuperscriptExtension.create(),
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java
index c48378817..4a8c6c36d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java
@@ -1,103 +1,148 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.markup.flexmark;
-
-import com.vladsch.flexmark.formatter.Formatter;
-import com.vladsch.flexmark.html.HtmlRenderer;
-import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
-import com.vladsch.flexmark.parser.ListOptions;
-import com.vladsch.flexmark.parser.Parser;
-import com.vladsch.flexmark.util.data.DataHolder;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-@SuppressWarnings("PMD.DataClass")
-public final class FlexmarkFactory {
-  @NonNull
-  private static final FlexmarkFactory SINGLETON = new FlexmarkFactory();
-  @NonNull
-  private final Parser markdownParser;
-  @NonNull
-  private final HtmlRenderer htmlRenderer;
-  @NonNull
-  private final Formatter formatter;
-  @NonNull
-  private final FlexmarkHtmlConverter htmlConverter;
-  @NonNull
-  final ListOptions listOptions;
-
-  @SuppressWarnings("PMD.AvoidSynchronizedAtMethodLevel")
-  @NonNull
-  public static synchronized FlexmarkFactory instance() {
-    return SINGLETON;
-  }
-
-  @NonNull
-  public static FlexmarkFactory newInstance(@NonNull DataHolder config) {
-    return new FlexmarkFactory(config);
-  }
-
-  private FlexmarkFactory() {
-    this(FlexmarkConfiguration.FLEXMARK_CONFIG);
-  }
-
-  @SuppressWarnings("null")
-  private FlexmarkFactory(@NonNull DataHolder config) {
-    this.markdownParser = Parser.builder(config)
-        .customDelimiterProcessor(new FixedEmphasisDelimiterProcessor(Parser.STRONG_WRAPS_EMPHASIS.get(config)))
-        .build();
-    this.htmlRenderer = HtmlRenderer.builder(config).build();
-    this.formatter = Formatter.builder(config).build();
-    this.htmlConverter = FlexmarkHtmlConverter.builder(config).build();
-    this.listOptions = ListOptions.get(config);
-  }
-
-  @NonNull
-  public ListOptions getListOptions() {
-    return listOptions;
-  }
-
-  @NonNull
-  public Parser getMarkdownParser() {
-    return markdownParser;
-  }
-
-  @NonNull
-  public HtmlRenderer getHtmlRenderer() {
-    return htmlRenderer;
-  }
-
-  @NonNull
-  public Formatter getFormatter() {
-    return formatter;
-  }
-
-  @NonNull
-  public FlexmarkHtmlConverter getFlexmarkHtmlConverter() {
-    return htmlConverter;
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.markup.flexmark;
+
+import com.vladsch.flexmark.formatter.Formatter;
+import com.vladsch.flexmark.html.HtmlRenderer;
+import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
+import com.vladsch.flexmark.parser.ListOptions;
+import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.util.data.DataHolder;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * Provides factory methods for Flexmark processing to support HTML-to-markdown
+ * and markdown-to-HTML conversion.
+ */
+@SuppressWarnings("PMD.DataClass")
+public final class FlexmarkFactory {
+  @NonNull
+  private static final FlexmarkFactory SINGLETON = new FlexmarkFactory();
+  @NonNull
+  private final Parser markdownParser;
+  @NonNull
+  private final HtmlRenderer htmlRenderer;
+  @NonNull
+  private final Formatter formatter;
+  @NonNull
+  private final FlexmarkHtmlConverter htmlConverter;
+  @NonNull
+  final ListOptions listOptions;
+
+  /**
+   * Get the static Flexmark factory instance.
+   *
+   * @return the instance
+   */
+  @SuppressWarnings("PMD.AvoidSynchronizedAtMethodLevel")
+  @NonNull
+  public static synchronized FlexmarkFactory instance() {
+    return SINGLETON;
+  }
+
+  /**
+   * Get a Flexmark factory instance that uses the provided Flexmark
+   * configuration.
+   *
+   * @param config
+   *          the Flexmark configuration
+   * @return the instance
+   */
+  @NonNull
+  public static FlexmarkFactory newInstance(@NonNull DataHolder config) {
+    return new FlexmarkFactory(config);
+  }
+
+  private FlexmarkFactory() {
+    this(FlexmarkConfiguration.FLEXMARK_CONFIG);
+  }
+
+  @SuppressWarnings("null")
+  private FlexmarkFactory(@NonNull DataHolder config) {
+    this.markdownParser = Parser.builder(config)
+        .customDelimiterProcessor(new FixedEmphasisDelimiterProcessor(Parser.STRONG_WRAPS_EMPHASIS.get(config)))
+        .build();
+    this.htmlRenderer = HtmlRenderer.builder(config).build();
+    this.formatter = Formatter.builder(config).build();
+    this.htmlConverter = FlexmarkHtmlConverter.builder(config).build();
+    this.listOptions = ListOptions.get(config);
+  }
+
+  /**
+   * Get configured options for processing HTML and markdown lists.
+   *
+   * @return the options
+   */
+  @NonNull
+  public ListOptions getListOptions() {
+    return listOptions;
+  }
+
+  /**
+   * Get the Flexmark markdown parser, which can produce a markdown syntax tree.
+   *
+   * @return the parser
+   */
+  @NonNull
+  public Parser getMarkdownParser() {
+    return markdownParser;
+  }
+
+  /**
+   * Get the Flexmark HTML renderer, which can produce HTML from a markdown syntax
+   * tree.
+   *
+   * @return the parser
+   */
+  @NonNull
+  public HtmlRenderer getHtmlRenderer() {
+    return htmlRenderer;
+  }
+
+  /**
+   * Get the Flexmark formatter, which can produce markdown from a markdown syntax
+   * tree.
+   *
+   * @return the parser
+   */
+  @NonNull
+  public Formatter getFormatter() {
+    return formatter;
+  }
+
+  /**
+   * Get the Flexmark HTML converter, which can produce markdown from HTML
+   * content.
+   *
+   * @return the parser
+   */
+  @NonNull
+  public FlexmarkHtmlConverter getFlexmarkHtmlConverter() {
+    return htmlConverter;
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/HtmlCodeRenderExtension.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/HtmlCodeRenderExtension.java
index e202be5fc..2b1521d9a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/HtmlCodeRenderExtension.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/HtmlCodeRenderExtension.java
@@ -57,7 +57,12 @@ public class HtmlCodeRenderExtension
     implements HtmlRenderer.HtmlRendererExtension {
   private static final Pattern EOL_PATTERN = Pattern.compile("\r\n|\r|\n");
 
-  public static HtmlCodeRenderExtension create() {
+  /**
+   * Construct a new extension instance.
+   *
+   * @return the instance
+   */
+  public static HtmlCodeRenderExtension newInstance() {
     return new HtmlCodeRenderExtension();
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/HtmlQuoteTagExtension.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/HtmlQuoteTagExtension.java
index e5cc2434a..1d52640e7 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/HtmlQuoteTagExtension.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/HtmlQuoteTagExtension.java
@@ -61,7 +61,12 @@ public class HtmlQuoteTagExtension
     implements Parser.ParserExtension, HtmlRenderer.HtmlRendererExtension,
     FlexmarkHtmlConverter.HtmlConverterExtension {
 
-  public static HtmlQuoteTagExtension create() {
+  /**
+   * Construct a new extension instance.
+   *
+   * @return the instance
+   */
+  public static HtmlQuoteTagExtension newInstance() {
     return new HtmlQuoteTagExtension();
   }
 
@@ -172,6 +177,13 @@ public HtmlNodeRenderer apply(DataHolder options) {
   public static class DoubleQuoteNode
       extends TypographicQuotes {
 
+    /**
+     * Construct a new double quote node.
+     *
+     * @param node
+     *          the typographic information pertaining to a double quote
+     */
+    @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
     public DoubleQuoteNode(TypographicQuotes node) {
       super(node.getOpeningMarker(), node.getText(), node.getClosingMarker());
       setTypographicOpening(node.getTypographicOpening());
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/IMarkupVisitor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/IMarkupVisitor.java
index d8a0a119b..8c81288e8 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/IMarkupVisitor.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/IMarkupVisitor.java
@@ -33,5 +33,15 @@
 
 @SuppressFBWarnings("THROWS_METHOD_THROWS_CLAUSE_THROWABLE")
 public interface IMarkupVisitor<T, E extends Throwable> {
+  /**
+   * A visitor callback used to visit a markdown syntax tree.
+   *
+   * @param document
+   *          the markdown syntax tree
+   * @param writer
+   *          a markup writer used to generate markup output
+   * @throws E
+   *           the visitor exception Java type
+   */
   void visitDocument(@NonNull Document document, @NonNull IMarkupWriter<T, E> writer) throws E;
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/IMarkupWriter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/IMarkupWriter.java
index b95169762..253e50176 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/IMarkupWriter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/IMarkupWriter.java
@@ -41,7 +41,6 @@
 import com.vladsch.flexmark.ast.IndentedCodeBlock;
 import com.vladsch.flexmark.ast.Link;
 import com.vladsch.flexmark.ast.ListBlock;
-import com.vladsch.flexmark.ast.ListItem;
 import com.vladsch.flexmark.ast.MailLink;
 import com.vladsch.flexmark.ast.Paragraph;
 import com.vladsch.flexmark.ast.Text;
@@ -58,8 +57,6 @@
 
 import java.util.Map;
 
-import javax.xml.namespace.QName;
-
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -67,9 +64,18 @@
 @SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_THROWABLE",
     justification = "There is a need to support varying exceptions from multiple stream writers")
 public interface IMarkupWriter<T, E extends Throwable> { // NOPMD
-  @NonNull
-  QName asQName(@NonNull String localName);
-
+  /**
+   * Write an HTML element with the provided local name, with no attributes.
+   *
+   * @param localName
+   *          the element name
+   * @param node
+   *          the markup node related to the element
+   * @param childHandler
+   *          a handler used to process child node content
+   * @throws E
+   *           if an error occurred while writing the markup
+   */
   default void writeElement(
       @NonNull String localName,
       @NonNull Node node,
@@ -77,135 +83,336 @@ default void writeElement(
     writeElement(localName, node, CollectionUtil.emptyMap(), childHandler);
   }
 
-  default void writeElement(
-      @NonNull String localName,
-      @NonNull Node node,
-      @NonNull Map<String, String> attributes,
-      @Nullable ChildHandler<T, E> childHandler) throws E {
-    QName qname = asQName(localName);
-    writeElement(qname, node, attributes, childHandler);
-  }
-
+  /**
+   * Write an HTML element with the provided local name.
+   *
+   * @param localName
+   *          the element name
+   * @param node
+   *          the markup node related to the element
+   * @param attributes
+   *          attributes associated with the element to also write
+   * @param childHandler
+   *          the handler used to process child node content or {@code null}
+   * @throws E
+   *           if an error occurred while writing the markup
+   */
   void writeElement(
-      @NonNull QName qname,
+      @NonNull String localName,
       @NonNull Node node,
       @NonNull Map<String, String> attributes,
       @Nullable ChildHandler<T, E> childHandler) throws E;
 
-  default void writeEmptyElement(
-      @NonNull String localName,
-      @NonNull Map<String, String> attributes) throws E {
-    QName qname = asQName(localName);
-    writeEmptyElement(qname, attributes);
-  }
-
+  /**
+   * Write an empty HTML element with the provided local name.
+   *
+   * @param localName
+   *          the element name
+   * @param attributes
+   *          attributes associated with the element to also write
+   * @throws E
+   *           if an error occurred while writing the markup
+   */
   void writeEmptyElement(
-      @NonNull QName qname,
-      @NonNull Map<String, String> attributes) throws E;
-
-  default void writeElementStart(
-      @NonNull QName qname) throws E {
-    writeElementStart(qname, CollectionUtil.emptyMap());
-  }
-
-  void writeElementStart(
-      @NonNull QName qname,
+      @NonNull String localName,
       @NonNull Map<String, String> attributes) throws E;
 
-  void writeElementEnd(@NonNull QName qname) throws E;
-
+  /**
+   * Write a text node.
+   *
+   * @param node
+   *          the text node to write
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeText(@NonNull Text node) throws E;
 
   /**
-   * Handle a combination of {@link Text} and {@link EscapedCharacter} node
+   * Write a combination of {@link Text} and {@link EscapedCharacter} node
    * children.
    *
    * @param node
    *          the text node to write
    * @throws E
-   *           if an error occured while writing
+   *           if an error occurred while writing
    */
   void writeText(@NonNull TextBase node) throws E;
 
+  /**
+   * Write a text string.
+   *
+   * @param text
+   *          the text to write
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeText(@NonNull CharSequence text) throws E;
 
+  /**
+   * Write an HTML entity.
+   *
+   * @param node
+   *          the entity node
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeHtmlEntity(@NonNull HtmlEntity node) throws E;
 
+  /**
+   * Write an HTML entity for a typographic character.
+   *
+   * @param node
+   *          the entity node
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeHtmlEntity(@NonNull TypographicSmarts node) throws E;
 
+  /**
+   * Write a paragraph.
+   *
+   * @param node
+   *          the paragraph node
+   * @param childHandler
+   *          the handler used to process child node content
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeParagraph(
       @NonNull Paragraph node,
       @NonNull ChildHandler<T, E> childHandler) throws E;
 
+  /**
+   * Write a link.
+   *
+   * @param node
+   *          the link node
+   * @param childHandler
+   *          the handler used to process child node content
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeLink(
       @NonNull Link node,
       @NonNull ChildHandler<T, E> childHandler) throws E;
 
+  /**
+   * Write an email link.
+   *
+   * @param node
+   *          the link node
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeLink(@NonNull MailLink node) throws E;
 
+  /**
+   * Write a link that was auto-detected.
+   *
+   * @param node
+   *          the link node
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeLink(@NonNull AutoLink node) throws E;
 
+  /**
+   * Write a typographic quote(s).
+   *
+   * @param node
+   *          the quote node
+   * @param childHandler
+   *          the handler used to process child node content
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeTypographicQuotes(
       @NonNull TypographicQuotes node,
       @NonNull ChildHandler<T, E> childHandler) throws E;
 
+  /**
+   * Write embedded HTML content.
+   *
+   * @param node
+   *          the HTML content
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeInlineHtml(@NonNull HtmlInline node) throws E;
 
+  /**
+   * Write HTML block content.
+   *
+   * @param node
+   *          the HTML block
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeBlockHtml(@NonNull HtmlBlock node) throws E;
 
+  /**
+   * Write a table.
+   *
+   * @param node
+   *          the table node
+   * @param childHandler
+   *          the handler used to process child node content
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeTable(
       @NonNull TableBlock node,
-      @NonNull ChildHandler<T, E> cellChilddHandler) throws E;
+      @NonNull ChildHandler<T, E> childHandler) throws E;
 
+  /**
+   * Write an image.
+   *
+   * @param node
+   *          the image node
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeImage(@NonNull Image node) throws E;
 
+  /**
+   * Write a Metaschema markup insertion point.
+   *
+   * @param node
+   *          the insert node
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeInsertAnchor(@NonNull InsertAnchorNode node) throws E;
 
+  /**
+   * Write a heading.
+   *
+   * @param node
+   *          the heading node
+   * @param childHandler
+   *          the handler used to process child node content
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeHeading(
       @NonNull Heading node,
       @NonNull ChildHandler<T, E> childHandler) throws E;
 
+  /**
+   * Write an inline code block.
+   *
+   * @param node
+   *          the code node
+   * @param childHandler
+   *          the handler used to process child node content
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeCode(
       @NonNull Code node,
       @NonNull ChildHandler<T, E> childHandler) throws E;
 
+  /**
+   * Write an indented code block.
+   *
+   * @param node
+   *          the code node
+   * @param childHandler
+   *          the handler used to process child node content
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeCodeBlock(
       @NonNull IndentedCodeBlock node,
       @NonNull ChildHandler<T, E> childHandler) throws E;
 
+  /**
+   * Write a fenced code block.
+   *
+   * @param node
+   *          the code node
+   * @param childHandler
+   *          the handler used to process child node content
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeCodeBlock(
       @NonNull FencedCodeBlock node,
       @NonNull ChildHandler<T, E> childHandler) throws E;
 
+  /**
+   * Write a code block.
+   *
+   * @param node
+   *          the code node
+   * @param childHandler
+   *          the handler used to process child node content
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeCodeBlock(
       @NonNull CodeBlock node,
       @NonNull ChildHandler<T, E> childHandler) throws E;
 
+  /**
+   * Write a block quotation.
+   *
+   * @param node
+   *          the quotation node
+   * @param childHandler
+   *          the handler used to process child node content
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeBlockQuote(
       @NonNull BlockQuote node,
       @NonNull ChildHandler<T, E> childHandler) throws E;
 
-  default void writeList(
-      @NonNull String localName,
-      @NonNull ListBlock node,
-      @NonNull ChildHandler<T, E> listItemHandler) throws E {
-    QName qname = asQName(localName);
-    writeList(qname, node, listItemHandler);
-  }
-
+  /**
+   * Write a list.
+   *
+   * @param localName
+   *          the HTML element name to use
+   * @param node
+   *          the list node
+   * @param handler
+   *          the list item handler
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeList(
-      @NonNull QName qname,
+      @NonNull String localName,
       @NonNull ListBlock node,
-      @NonNull ChildHandler<T, E> listItemHandler) throws E;
-
-  void writeListItem(
-      @NonNull ListItem node,
-      @NonNull ChildHandler<T, E> listItemHandler) throws E;
+      @NonNull ChildHandler<T, E> handler) throws E;
 
+  /**
+   * Write a line break.
+   *
+   * @param node
+   *          the break node
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeBreak(@NonNull HardLineBreak node) throws E;
 
+  /**
+   * Write a line break.
+   *
+   * @param node
+   *          the break node
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeBreak(@NonNull ThematicBreak node) throws E;
 
+  /**
+   * Write a comment.
+   *
+   * @param node
+   *          the comment node
+   * @throws E
+   *           if an error occurred while writing
+   */
   void writeComment(@NonNull HtmlCommentBlock node) throws E;
 
   /**
@@ -217,7 +424,17 @@ void writeListItem(
    *          the type of exception that can be thrown when a writing error occurs
    */
   @FunctionalInterface
-  interface ChildHandler<T, E extends Throwable> { // NOPMD
+  interface ChildHandler<T, E extends Throwable> {
+    /**
+     * A callback used to process a given node.
+     *
+     * @param node
+     *          the node to process
+     * @param writer
+     *          used to write if an error occurred while writing
+     * @throws E
+     *           if an error occurred while writing
+     */
     void accept(@NonNull Node node, @NonNull IMarkupWriter<T, E> writer) throws E;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java
index 8300faa5a..902b35dd9 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java
@@ -1,348 +1,433 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.markup.flexmark; // NOPMD AST processor
-
-import com.vladsch.flexmark.formatter.Formatter;
-import com.vladsch.flexmark.formatter.MarkdownWriter;
-import com.vladsch.flexmark.formatter.NodeFormatter;
-import com.vladsch.flexmark.formatter.NodeFormatterContext;
-import com.vladsch.flexmark.formatter.NodeFormatterFactory;
-import com.vladsch.flexmark.formatter.NodeFormattingHandler;
-import com.vladsch.flexmark.html.HtmlRenderer;
-import com.vladsch.flexmark.html.HtmlWriter;
-import com.vladsch.flexmark.html.renderer.NodeRenderer;
-import com.vladsch.flexmark.html.renderer.NodeRendererContext;
-import com.vladsch.flexmark.html.renderer.NodeRendererFactory;
-import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
-import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
-import com.vladsch.flexmark.html2md.converter.HtmlMarkdownWriter;
-import com.vladsch.flexmark.html2md.converter.HtmlNodeConverterContext;
-import com.vladsch.flexmark.html2md.converter.HtmlNodeRenderer;
-import com.vladsch.flexmark.html2md.converter.HtmlNodeRendererFactory;
-import com.vladsch.flexmark.html2md.converter.HtmlNodeRendererHandler;
-import com.vladsch.flexmark.parser.InlineParser;
-import com.vladsch.flexmark.parser.InlineParserExtension;
-import com.vladsch.flexmark.parser.InlineParserExtensionFactory;
-import com.vladsch.flexmark.parser.LightInlineParser;
-import com.vladsch.flexmark.parser.Parser;
-import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.data.DataHolder;
-import com.vladsch.flexmark.util.data.DataKey;
-import com.vladsch.flexmark.util.data.MutableDataHolder;
-import com.vladsch.flexmark.util.misc.Extension;
-import com.vladsch.flexmark.util.sequence.BasedSequence;
-import com.vladsch.flexmark.util.sequence.CharSubSequence;
-
-import org.jsoup.nodes.Element;
-
-import java.util.Collections;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class InsertAnchorExtension
-    implements Parser.ParserExtension, HtmlRenderer.HtmlRendererExtension,
-    Formatter.FormatterExtension, FlexmarkHtmlConverter.HtmlConverterExtension {
-  public static final DataKey<Boolean> ENABLE_INLINE_INSERT_ANCHORS
-      = new DataKey<>("ENABLE_INLINE_INSERT_ANCHORS", true);
-  public static final DataKey<Boolean> ENABLE_RENDERING = new DataKey<>("ENABLE_RENDERING", true);
-
-  public static Extension create() {
-    return new InsertAnchorExtension();
-  }
-
-  @Override
-  public void parserOptions(MutableDataHolder options) {
-    // do nothing
-  }
-
-  @Override
-  public void rendererOptions(MutableDataHolder options) {
-    // do nothing
-  }
-
-  @Override
-  public void extend(HtmlRenderer.Builder rendererBuilder, String rendererType) {
-    rendererBuilder.nodeRendererFactory(new InsertAnchorNodeRenderer.Factory());
-  }
-
-  @Override
-  public void extend(Parser.Builder parserBuilder) {
-    if (ENABLE_INLINE_INSERT_ANCHORS.get(parserBuilder)) {
-      parserBuilder.customInlineParserExtensionFactory(new InsertAnchorInlineParser.Factory());
-    }
-  }
-
-  @Override
-  public void extend(Formatter.Builder builder) {
-    builder.nodeFormatterFactory(new InsertAnchorFormatter.Factory());
-  }
-
-  @Override
-  public void extend(FlexmarkHtmlConverter.Builder builder) {
-    builder.htmlNodeRendererFactory(new InsertAnchorHtmlNodeRenderer.Factory());
-  }
-
-  private static class InsertAnchorOptions {
-    public final boolean enableInlineInsertAnchors;
-    public final boolean enableRendering;
-
-    public InsertAnchorOptions(DataHolder options) {
-      enableInlineInsertAnchors = ENABLE_INLINE_INSERT_ANCHORS.get(options);
-      enableRendering = ENABLE_RENDERING.get(options);
-    }
-  }
-
-  private static class InsertAnchorNodeRenderer implements NodeRenderer {
-    private final InsertAnchorOptions options;
-
-    public InsertAnchorNodeRenderer(DataHolder options) {
-      this.options = new InsertAnchorOptions(options);
-    }
-
-    @Override
-    public Set<NodeRenderingHandler<?>> getNodeRenderingHandlers() {
-      return Collections.singleton(new NodeRenderingHandler<>(InsertAnchorNode.class, this::render));
-    }
-
-    @SuppressWarnings("unused")
-    protected void render(InsertAnchorNode node, NodeRendererContext context, HtmlWriter html) {
-      if (options.enableRendering) {
-        html.attr("type", node.getType()).attr("id-ref", node.getIdReference()).withAttr().tagVoid("insert");
-      }
-    }
-
-    // @Override
-    // public Set<NodeRenderingHandler<?>> getNodeRenderingHandlers() {
-    // HashSet<NodeRenderingHandler<?>> set = new
-    // HashSet<NodeRenderingHandler<?>>();
-    // set.add(new NodeRenderingHandler<Macro>(Macro.class, new
-    // CustomNodeRenderer<Macro>() {
-    // @Override
-    // public void render(Macro node, NodeRendererContext context, HtmlWriter html)
-    // {
-    // MacroNodeRenderer.this.render(node, context, html); }
-    // }));
-    public static class Factory implements NodeRendererFactory {
-
-      @Override
-      public NodeRenderer apply(DataHolder options) {
-        return new InsertAnchorNodeRenderer(options);
-      }
-
-    }
-
-  }
-
-  private static class InsertAnchorInlineParser implements InlineParserExtension {
-    private static final Pattern PATTERN = Pattern.compile("\\{\\{\\s*insert:\\s*([^\\s]+),\\s*([^\\s]+)\\s*\\}\\}");
-
-    public InsertAnchorInlineParser(@SuppressWarnings("unused") LightInlineParser inlineParser) {
-      // do nothing
-    }
-
-    @Override
-    public void finalizeDocument(InlineParser inlineParser) {
-      // do nothing
-    }
-
-    @Override
-    public void finalizeBlock(InlineParser inlineParser) {
-      // do nothing
-    }
-
-    @Override
-    public boolean parse(LightInlineParser inlineParser) {
-      if (inlineParser.peek() == '{') {
-        BasedSequence input = inlineParser.getInput();
-        Matcher matcher = inlineParser.matcher(PATTERN);
-        if (matcher != null) {
-          BasedSequence type = input.subSequence(matcher.start(1), matcher.end(1));
-          BasedSequence idReference = input.subSequence(matcher.start(2), matcher.end(2));
-          assert type != null;
-          assert idReference != null;
-          inlineParser.appendNode(new InsertAnchorNode(type, idReference));
-          return true; // NOPMD - readability
-        }
-      }
-      return false;
-    }
-
-    public static class Factory implements InlineParserExtensionFactory {
-      @Override
-      public Set<Class<?>> getAfterDependents() {
-        return Collections.emptySet();
-      }
-
-      @Override
-      public CharSequence getCharacters() {
-        return "{";
-      }
-
-      @Override
-      public Set<Class<?>> getBeforeDependents() {
-        return Collections.emptySet();
-      }
-
-      @Override
-      public InlineParserExtension apply(LightInlineParser lightInlineParser) {
-        return new InsertAnchorInlineParser(lightInlineParser);
-      }
-
-      @Override
-      public boolean affectsGlobalScope() {
-        return false;
-      }
-    }
-  }
-
-  private static class InsertAnchorFormatter implements NodeFormatter {
-    private final InsertAnchorOptions options;
-
-    public InsertAnchorFormatter(DataHolder options) {
-      this.options = new InsertAnchorOptions(options);
-    }
-
-    @Override
-    public Set<NodeFormattingHandler<?>> getNodeFormattingHandlers() {
-      return options.enableInlineInsertAnchors
-          ? Collections.singleton(new NodeFormattingHandler<>(InsertAnchorNode.class, this::render))
-          : Collections.emptySet();
-    }
-
-    @SuppressWarnings("unused")
-    protected void render(InsertAnchorNode node, NodeFormatterContext context, MarkdownWriter markdown) {
-      if (options.enableRendering) {
-        markdown.append("{{ insert: ");
-        markdown.append(node.getType());
-        markdown.append(", ");
-        markdown.append(node.getIdReference());
-        markdown.append(" }}");
-      }
-    }
-
-    @Override
-    public Set<Class<?>> getNodeClasses() {
-      return Collections.singleton(InsertAnchorNode.class);
-    }
-
-    public static class Factory implements NodeFormatterFactory {
-
-      @Override
-      public NodeFormatter create(DataHolder options) {
-        return new InsertAnchorFormatter(options);
-      }
-
-    }
-  }
-
-  private static class InsertAnchorHtmlNodeRenderer implements HtmlNodeRenderer {
-    private final InsertAnchorOptions options;
-
-    public InsertAnchorHtmlNodeRenderer(DataHolder options) {
-      this.options = new InsertAnchorOptions(options);
-    }
-
-    @Override
-    public Set<HtmlNodeRendererHandler<?>> getHtmlNodeRendererHandlers() {
-      return options.enableInlineInsertAnchors
-          ? Collections.singleton(new HtmlNodeRendererHandler<>("insert", Element.class, this::processInsert))
-          : Collections.emptySet();
-    }
-
-    private void processInsert( // NOPMD used as lambda
-        Element node,
-        @SuppressWarnings("unused") HtmlNodeConverterContext context,
-        HtmlMarkdownWriter out) {
-
-      String type = node.attr("type");
-      String idRef = node.attr("id-ref");
-
-      out.append("{{ insert: ");
-      out.append(type);
-      out.append(", ");
-      out.append(idRef);
-      out.append(" }}");
-    }
-
-    public static class Factory implements HtmlNodeRendererFactory {
-
-      @Override
-      public HtmlNodeRenderer apply(DataHolder options) {
-        return new InsertAnchorHtmlNodeRenderer(options);
-      }
-    }
-  }
-
-  public static class InsertAnchorNode
-      extends Node {
-
-    @NonNull
-    private BasedSequence type;
-    @NonNull
-    private BasedSequence idReference;
-
-    @SuppressWarnings("null")
-    public InsertAnchorNode(@NonNull String type, @NonNull String idReference) {
-      this(CharSubSequence.of(type), CharSubSequence.of(idReference));
-    }
-
-    public InsertAnchorNode(@NonNull BasedSequence type, @NonNull BasedSequence idReference) {
-      this.type = type;
-      this.idReference = idReference;
-    }
-
-    @NonNull
-    public BasedSequence getType() {
-      return type;
-    }
-
-    @NonNull
-    public BasedSequence getIdReference() {
-      return idReference;
-    }
-
-    public void setIdReference(@NonNull BasedSequence value) {
-      this.idReference = value;
-    }
-
-    @Override
-    @NonNull
-    public BasedSequence[] getSegments() {
-      @NonNull BasedSequence[] retval = { getType(), getIdReference() };
-      return retval;
-    }
-
-    @Override
-    public void getAstExtra(StringBuilder out) {
-      segmentSpanChars(out, getType(), "type");
-      segmentSpanChars(out, getIdReference(), "id-ref");
-    }
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.markup.flexmark; // NOPMD AST processor
+
+import com.vladsch.flexmark.formatter.Formatter;
+import com.vladsch.flexmark.formatter.MarkdownWriter;
+import com.vladsch.flexmark.formatter.NodeFormatter;
+import com.vladsch.flexmark.formatter.NodeFormatterContext;
+import com.vladsch.flexmark.formatter.NodeFormatterFactory;
+import com.vladsch.flexmark.formatter.NodeFormattingHandler;
+import com.vladsch.flexmark.html.HtmlRenderer;
+import com.vladsch.flexmark.html.HtmlWriter;
+import com.vladsch.flexmark.html.renderer.NodeRenderer;
+import com.vladsch.flexmark.html.renderer.NodeRendererContext;
+import com.vladsch.flexmark.html.renderer.NodeRendererFactory;
+import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
+import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
+import com.vladsch.flexmark.html2md.converter.HtmlMarkdownWriter;
+import com.vladsch.flexmark.html2md.converter.HtmlNodeConverterContext;
+import com.vladsch.flexmark.html2md.converter.HtmlNodeRenderer;
+import com.vladsch.flexmark.html2md.converter.HtmlNodeRendererFactory;
+import com.vladsch.flexmark.html2md.converter.HtmlNodeRendererHandler;
+import com.vladsch.flexmark.parser.InlineParser;
+import com.vladsch.flexmark.parser.InlineParserExtension;
+import com.vladsch.flexmark.parser.InlineParserExtensionFactory;
+import com.vladsch.flexmark.parser.LightInlineParser;
+import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.util.ast.Node;
+import com.vladsch.flexmark.util.ast.NodeVisitorBase;
+import com.vladsch.flexmark.util.data.DataHolder;
+import com.vladsch.flexmark.util.data.DataKey;
+import com.vladsch.flexmark.util.data.MutableDataHolder;
+import com.vladsch.flexmark.util.sequence.BasedSequence;
+import com.vladsch.flexmark.util.sequence.CharSubSequence;
+
+import gov.nist.secauto.metaschema.core.datatype.markup.IMarkupString;
+
+import org.jsoup.nodes.Element;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class InsertAnchorExtension
+    implements Parser.ParserExtension, HtmlRenderer.HtmlRendererExtension,
+    Formatter.FormatterExtension, FlexmarkHtmlConverter.HtmlConverterExtension {
+  public static final DataKey<Boolean> ENABLE_INLINE_INSERT_ANCHORS
+      = new DataKey<>("ENABLE_INLINE_INSERT_ANCHORS", true);
+  public static final DataKey<Boolean> ENABLE_RENDERING = new DataKey<>("ENABLE_RENDERING", true);
+
+  /**
+   * Construct a new extension instance.
+   *
+   * @return the instance
+   */
+  public static InsertAnchorExtension newInstance() {
+    return new InsertAnchorExtension();
+  }
+
+  @Override
+  public void parserOptions(MutableDataHolder options) {
+    // do nothing
+  }
+
+  @Override
+  public void rendererOptions(MutableDataHolder options) {
+    // do nothing
+  }
+
+  @Override
+  public void extend(HtmlRenderer.Builder rendererBuilder, String rendererType) {
+    rendererBuilder.nodeRendererFactory(new InsertAnchorNodeRenderer.Factory());
+  }
+
+  @Override
+  public void extend(Parser.Builder parserBuilder) {
+    if (ENABLE_INLINE_INSERT_ANCHORS.get(parserBuilder)) {
+      parserBuilder.customInlineParserExtensionFactory(new InsertAnchorInlineParser.Factory());
+    }
+  }
+
+  @Override
+  public void extend(Formatter.Builder builder) {
+    builder.nodeFormatterFactory(new InsertAnchorFormatter.Factory());
+  }
+
+  @Override
+  public void extend(FlexmarkHtmlConverter.Builder builder) {
+    builder.htmlNodeRendererFactory(new InsertAnchorHtmlNodeRenderer.Factory());
+  }
+
+  private static class InsertAnchorOptions {
+    public final boolean enableInlineInsertAnchors;
+    public final boolean enableRendering;
+
+    public InsertAnchorOptions(DataHolder options) {
+      enableInlineInsertAnchors = ENABLE_INLINE_INSERT_ANCHORS.get(options);
+      enableRendering = ENABLE_RENDERING.get(options);
+    }
+  }
+
+  private static class InsertAnchorNodeRenderer implements NodeRenderer {
+    private final InsertAnchorOptions options;
+
+    public InsertAnchorNodeRenderer(DataHolder options) {
+      this.options = new InsertAnchorOptions(options);
+    }
+
+    @Override
+    public Set<NodeRenderingHandler<?>> getNodeRenderingHandlers() {
+      return Collections.singleton(new NodeRenderingHandler<>(InsertAnchorNode.class, this::render));
+    }
+
+    @SuppressWarnings("unused")
+    protected void render(InsertAnchorNode node, NodeRendererContext context, HtmlWriter html) {
+      if (options.enableRendering) {
+        html.attr("type", node.getType()).attr("id-ref", node.getIdReference()).withAttr().tagVoid("insert");
+      }
+    }
+
+    public static class Factory implements NodeRendererFactory {
+
+      @Override
+      public NodeRenderer apply(DataHolder options) {
+        return new InsertAnchorNodeRenderer(options);
+      }
+    }
+  }
+
+  private static class InsertAnchorInlineParser implements InlineParserExtension {
+    private static final Pattern PATTERN = Pattern.compile("\\{\\{\\s*insert:\\s*([^\\s]+),\\s*([^\\s]+)\\s*\\}\\}");
+
+    public InsertAnchorInlineParser(@SuppressWarnings("unused") LightInlineParser inlineParser) {
+      // do nothing
+    }
+
+    @Override
+    public void finalizeDocument(InlineParser inlineParser) {
+      // do nothing
+    }
+
+    @Override
+    public void finalizeBlock(InlineParser inlineParser) {
+      // do nothing
+    }
+
+    @Override
+    public boolean parse(LightInlineParser inlineParser) {
+      if (inlineParser.peek() == '{') {
+        BasedSequence input = inlineParser.getInput();
+        Matcher matcher = inlineParser.matcher(PATTERN);
+        if (matcher != null) {
+          BasedSequence type = input.subSequence(matcher.start(1), matcher.end(1));
+          BasedSequence idReference = input.subSequence(matcher.start(2), matcher.end(2));
+          assert type != null;
+          assert idReference != null;
+          inlineParser.appendNode(new InsertAnchorNode(type, idReference));
+          return true; // NOPMD - readability
+        }
+      }
+      return false;
+    }
+
+    public static class Factory implements InlineParserExtensionFactory {
+      @Override
+      public Set<Class<?>> getAfterDependents() {
+        return Collections.emptySet();
+      }
+
+      @Override
+      public CharSequence getCharacters() {
+        return "{";
+      }
+
+      @Override
+      public Set<Class<?>> getBeforeDependents() {
+        return Collections.emptySet();
+      }
+
+      @Override
+      public InlineParserExtension apply(LightInlineParser lightInlineParser) {
+        return new InsertAnchorInlineParser(lightInlineParser);
+      }
+
+      @Override
+      public boolean affectsGlobalScope() {
+        return false;
+      }
+    }
+  }
+
+  private static class InsertAnchorFormatter implements NodeFormatter {
+    private final InsertAnchorOptions options;
+
+    public InsertAnchorFormatter(DataHolder options) {
+      this.options = new InsertAnchorOptions(options);
+    }
+
+    @Override
+    public Set<NodeFormattingHandler<?>> getNodeFormattingHandlers() {
+      return options.enableInlineInsertAnchors
+          ? Collections.singleton(new NodeFormattingHandler<>(InsertAnchorNode.class, this::render))
+          : Collections.emptySet();
+    }
+
+    @SuppressWarnings("unused")
+    protected void render(InsertAnchorNode node, NodeFormatterContext context, MarkdownWriter markdown) {
+      if (options.enableRendering) {
+        markdown.append("{{ insert: ");
+        markdown.append(node.getType());
+        markdown.append(", ");
+        markdown.append(node.getIdReference());
+        markdown.append(" }}");
+      }
+    }
+
+    @Override
+    public Set<Class<?>> getNodeClasses() {
+      return Collections.singleton(InsertAnchorNode.class);
+    }
+
+    public static class Factory implements NodeFormatterFactory {
+
+      @Override
+      public NodeFormatter create(DataHolder options) {
+        return new InsertAnchorFormatter(options);
+      }
+
+    }
+  }
+
+  private static class InsertAnchorHtmlNodeRenderer implements HtmlNodeRenderer {
+    private final InsertAnchorOptions options;
+
+    public InsertAnchorHtmlNodeRenderer(DataHolder options) {
+      this.options = new InsertAnchorOptions(options);
+    }
+
+    @Override
+    public Set<HtmlNodeRendererHandler<?>> getHtmlNodeRendererHandlers() {
+      return options.enableInlineInsertAnchors
+          ? Collections.singleton(new HtmlNodeRendererHandler<>("insert", Element.class, this::processInsert))
+          : Collections.emptySet();
+    }
+
+    private void processInsert( // NOPMD used as lambda
+        Element node,
+        @SuppressWarnings("unused") HtmlNodeConverterContext context,
+        HtmlMarkdownWriter out) {
+
+      String type = node.attr("type");
+      String idRef = node.attr("id-ref");
+
+      out.append("{{ insert: ");
+      out.append(type);
+      out.append(", ");
+      out.append(idRef);
+      out.append(" }}");
+    }
+
+    public static class Factory implements HtmlNodeRendererFactory {
+
+      @Override
+      public HtmlNodeRenderer apply(DataHolder options) {
+        return new InsertAnchorHtmlNodeRenderer(options);
+      }
+    }
+  }
+
+  public static class InsertAnchorNode
+      extends Node {
+
+    @NonNull
+    private final BasedSequence type;
+    @NonNull
+    private BasedSequence idReference;
+
+    /**
+     * Construct a new Metaschema insert node.
+     *
+     * @param type
+     *          the type of insertion
+     * @param idReference
+     *          the identifier of the given type to use to determine what to insert
+     */
+    @SuppressWarnings("null")
+    public InsertAnchorNode(@NonNull String type, @NonNull String idReference) {
+      this(CharSubSequence.of(type), CharSubSequence.of(idReference));
+    }
+
+    /**
+     * Construct a new Metaschema insert node.
+     *
+     * @param type
+     *          the type of insertion
+     * @param idReference
+     *          the identifier of the given type to use to determine what to insert
+     */
+    protected InsertAnchorNode(@NonNull BasedSequence type, @NonNull BasedSequence idReference) {
+      this.type = type;
+      this.idReference = idReference;
+    }
+
+    /**
+     * Get the type of insertion.
+     *
+     * @return the type of insertion
+     */
+    @NonNull
+    public BasedSequence getType() {
+      return type;
+    }
+
+    /**
+     * Get the identifier of the given type to use to determine what to insert.
+     *
+     * @return the identifier
+     */
+    @NonNull
+    public BasedSequence getIdReference() {
+      return idReference;
+    }
+
+    /**
+     * Set the identifier of the given type to use to determine what to insert.
+     *
+     * @param idReference
+     *          the identifier
+     */
+    public void setIdReference(@NonNull BasedSequence idReference) {
+      this.idReference = idReference;
+    }
+
+    @Override
+    @NonNull
+    public BasedSequence[] getSegments() {
+      @NonNull BasedSequence[] retval = { getType(), getIdReference() };
+      return retval;
+    }
+
+    @Override
+    public void getAstExtra(StringBuilder out) {
+      segmentSpanChars(out, getType(), "type");
+      segmentSpanChars(out, getIdReference(), "id-ref");
+    }
+  }
+
+  /**
+   * Used to collect insert nodes.
+   */
+  public static class InsertVisitor
+      extends NodeVisitorBase {
+    @NonNull
+    private final List<InsertAnchorNode> inserts = new LinkedList<>();
+    @NonNull
+    private final Predicate<InsertAnchorNode> filter;
+
+    /**
+     * Construct a new visitor that will use the provided filter to visit matching
+     * insert nodes.
+     *
+     * @param filter
+     *          the match criteria to use to identify matching insert nodes
+     */
+    public InsertVisitor(@NonNull Predicate<InsertAnchorNode> filter) {
+      this.filter = filter;
+    }
+
+    /**
+     * Process markup to identify insert nodes.
+     *
+     * @param markup
+     *          the markup to process
+     * @return this visitor
+     */
+    public InsertVisitor processNode(@NonNull IMarkupString<?> markup) {
+      visit(markup.getDocument());
+      return this;
+    }
+
+    @Override
+    protected void visit(Node node) {
+      if (node instanceof InsertAnchorNode) {
+        InsertAnchorNode insert = (InsertAnchorNode) node;
+        if (filter.test(insert)) {
+          inserts.add((InsertAnchorNode) node);
+        }
+      } else {
+        visitChildren(node);
+      }
+    }
+
+    /**
+     * Get the collected insert nodes.
+     *
+     * @return the nodes
+     */
+    @NonNull
+    public List<InsertAnchorNode> getInserts() {
+      return inserts;
+    }
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupVisitor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupVisitor.java
index 42d44158a..c9fff8b52 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupVisitor.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupVisitor.java
@@ -69,7 +69,8 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
- *
+ * Supports the production of HTML content based on a markup syntax tree.
+ * <p>
  * This implementation is stateless.
  *
  * @param <T>
@@ -81,10 +82,23 @@
 public class MarkupVisitor<T, E extends Throwable> implements IMarkupVisitor<T, E> {
   private final boolean handleBlockElements;
 
+  /**
+   * Construct a new visitor.
+   *
+   * @param handleBlockElements
+   *          {@code true} process block content or {@code false} process the tree
+   *          as a single line of markup
+   */
   public MarkupVisitor(boolean handleBlockElements) {
     this.handleBlockElements = handleBlockElements;
   }
 
+  /**
+   * Determine block processing state.
+   *
+   * @return {@code true} process block content or {@code false} process the tree
+   *         as a single line of markup
+   */
   protected boolean isHandleBlockElements() {
     return handleBlockElements;
   }
@@ -94,13 +108,33 @@ public void visitDocument(Document document, IMarkupWriter<T, E> writer) throws
     visitChildren(document, writer);
   }
 
-  protected void visitChildren(@NonNull Node parentNode, @NonNull IMarkupWriter<T, E> writer) throws E {
-    for (Node node : parentNode.getChildren()) {
+  /**
+   * Process child nodes of the provided parent.
+   *
+   * @param parent
+   *          the node whose children are to be processed
+   * @param writer
+   *          the markup writer used to write the HTML
+   * @throws E
+   *           if an error occurred while writing
+   */
+  protected void visitChildren(@NonNull Node parent, @NonNull IMarkupWriter<T, E> writer) throws E {
+    for (Node node : parent.getChildren()) {
       assert node != null;
       visit(node, writer);
     }
   }
 
+  /**
+   * Process a node.
+   *
+   * @param node
+   *          the node to process
+   * @param writer
+   *          the markup writer used to write the HTML
+   * @throws E
+   *           if an error occurred while writing
+   */
   protected void visit(@NonNull Node node, @NonNull IMarkupWriter<T, E> writer) throws E {
     boolean handled = processInlineElements(node, writer);
     if (!handled && node instanceof Block) {
@@ -118,7 +152,19 @@ protected void visit(@NonNull Node node, @NonNull IMarkupWriter<T, E> writer) th
     }
   }
 
-  protected boolean processInlineElements( // NOPMD dispatch method
+  /**
+   * Process a node that represents an inline element.
+   *
+   * @param node
+   *          the node to process
+   * @param writer
+   *          the markup writer used to write the HTML
+   * @return {@code true} if the node was processed or {@code false} otherwise
+   * @throws E
+   *           if an error occurred while writing
+   */
+  @SuppressWarnings({ "PMD.CyclomaticComplexity", "PMD.CognitiveComplexity", "PMD.NcssCount" })
+  protected boolean processInlineElements(
       @NonNull Node node,
       @NonNull IMarkupWriter<T, E> writer) throws E { // NOPMD - acceptable
     boolean retval = true;
@@ -172,7 +218,19 @@ protected boolean processInlineElements( // NOPMD dispatch method
     return retval;
   }
 
-  protected boolean processBlockElements( // NOPMD dispatch method
+  /**
+   * Process a node that represents a block element.
+   *
+   * @param node
+   *          the node to process
+   * @param writer
+   *          the markup writer used to write the HTML
+   * @return {@code true} if the node was processed or {@code false} otherwise
+   * @throws E
+   *           if an error occurred while writing
+   */
+  @SuppressWarnings("PMD.CyclomaticComplexity")
+  protected boolean processBlockElements(
       @NonNull Node node,
       @NonNull IMarkupWriter<T, E> writer) throws E {
     boolean retval = true;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupXmlEventWriter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupXmlEventWriter.java
index 16806f8e2..ccfe2e099 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupXmlEventWriter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupXmlEventWriter.java
@@ -28,6 +28,7 @@
 
 import com.vladsch.flexmark.parser.ListOptions;
 
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.AbstractMarkupWriter;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -53,6 +54,18 @@ public class MarkupXmlEventWriter
   @NonNull
   protected final XMLEventFactory2 eventFactory;
 
+  /**
+   * Construct a new event writer.
+   *
+   * @param namespace
+   *          the XML namespace to use for XMHTML content
+   * @param listOptions
+   *          list production options
+   * @param writer
+   *          the XML event stream to write to
+   * @param eventFactory
+   *          the XML event factory used to generate XML events
+   */
   public MarkupXmlEventWriter(
       @NonNull String namespace,
       @NonNull ListOptions listOptions,
@@ -62,11 +75,23 @@ public MarkupXmlEventWriter(
     this.eventFactory = Objects.requireNonNull(eventFactory, "eventFactory");
   }
 
+  /**
+   * Get the XML event factory used to generate XML events.
+   *
+   * @return the XML event factory
+   */
   @NonNull
   protected XMLEventFactory2 getEventFactory() {
     return eventFactory;
   }
 
+  /**
+   * Get XML events for the provided attributes.
+   *
+   * @param attributes
+   *          the mapping of attribute name to value
+   * @return the list of attribute events
+   */
   @NonNull
   protected List<Attribute> handleAttributes(@NonNull Map<String, String> attributes) {
     List<Attribute> attrs;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriter.java
index 3f79e7f4f..6c9d526cc 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriter.java
@@ -28,6 +28,8 @@
 
 import com.vladsch.flexmark.parser.ListOptions;
 
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.AbstractMarkupWriter;
+
 import java.util.Map;
 
 import javax.xml.namespace.QName;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/SuppressPTagExtension.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/SuppressPTagExtension.java
index 5f3f9822e..3d947f34e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/SuppressPTagExtension.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/SuppressPTagExtension.java
@@ -45,7 +45,12 @@
 public class SuppressPTagExtension
     implements HtmlRenderer.HtmlRendererExtension {
 
-  public static SuppressPTagExtension create() {
+  /**
+   * Construct a new extension instance.
+   *
+   * @return the instance
+   */
+  public static SuppressPTagExtension newInstance() {
     return new SuppressPTagExtension();
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/XmlMarkupParser.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/XmlMarkupParser.java
index cfe2b8959..065daca48 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/XmlMarkupParser.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/XmlMarkupParser.java
@@ -1,247 +1,280 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.markup.flexmark;
-
-import com.vladsch.flexmark.util.sequence.Escaping;
-
-import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
-import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil;
-import gov.nist.secauto.metaschema.core.util.CollectionUtil;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.codehaus.stax2.XMLEventReader2;
-
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.events.Attribute;
-import javax.xml.stream.events.Characters;
-import javax.xml.stream.events.StartElement;
-import javax.xml.stream.events.XMLEvent;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public final class XmlMarkupParser {
-  private static final Logger LOGGER = LogManager.getLogger(XmlMarkupParser.class);
-
-  @NonNull
-  public static final Set<String> BLOCK_ELEMENTS = ObjectUtils.notNull(
-      Set.of(
-          "h1",
-          "h2",
-          "h3",
-          "h4",
-          "h5",
-          "h6",
-          "ul",
-          "ol",
-          "pre",
-          "hr",
-          "blockquote",
-          "p",
-          "table",
-          "img"));
-
-  @NonNull
-  private static final XmlMarkupParser SINGLETON = new XmlMarkupParser();
-
-  @SuppressWarnings("PMD.AvoidSynchronizedAtMethodLevel")
-  @NonNull
-  public static synchronized XmlMarkupParser instance() {
-    return SINGLETON;
-  }
-
-  private XmlMarkupParser() {
-    // disable construction
-  }
-
-  public MarkupLine parseMarkupline(XMLEventReader2 reader) throws XMLStreamException { // NOPMD - acceptable
-    StringBuilder buffer = new StringBuilder();
-    parseContents(reader, null, buffer);
-    String html = buffer.toString().trim();
-    return html.isEmpty() ? null : MarkupLine.fromHtml(html);
-  }
-
-  public MarkupMultiline parseMarkupMultiline(XMLEventReader2 reader) throws XMLStreamException {
-    StringBuilder buffer = new StringBuilder();
-    parseToString(reader, buffer);
-    String html = buffer.toString().trim();
-
-    if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("XML->HTML: {}", html);
-    }
-    return html.isEmpty() ? null : MarkupMultiline.fromHtml(html);
-  }
-
-  private void parseToString(XMLEventReader2 reader, StringBuilder buffer) // NOPMD - acceptable
-      throws XMLStreamException {
-    // if (LOGGER.isDebugEnabled()) {
-    // LOGGER.debug("parseToString(enter): {}",
-    // XmlEventUtil.toString(reader.peek()));
-    // }
-
-    outer: while (reader.hasNextEvent() && !reader.peek().isEndElement()) {
-      // skip whitespace before the next block element
-      XMLEvent nextEvent = XmlEventUtil.skipWhitespace(reader);
-
-      // if (LOGGER.isDebugEnabled()) {
-      // LOGGER.debug("parseToString: {}", XmlEventUtil.toString(nextEvent));
-      // }
-
-      if (nextEvent.isStartElement()) {
-        StartElement start = nextEvent.asStartElement();
-        QName name = start.getName();
-
-        // Note: the next element is not consumed. The called method is expected to
-        // consume it
-        if (BLOCK_ELEMENTS.contains(name.getLocalPart())) {
-          parseStartElement(reader, start, buffer);
-
-          // the next event should be the event after the start's END_ELEMENT
-          // assert XmlEventUtil.isNextEventEndElement(reader, name) :
-          // XmlEventUtil.toString(reader.peek());
-        } else {
-          // throw new IllegalStateException();
-          // stop parsing on first unrecognized event
-          break outer;
-        }
-      }
-      // reader.nextEvent();
-
-      // skip whitespace before the next block element
-      XmlEventUtil.skipWhitespace(reader);
-    }
-
-    // if (LOGGER.isDebugEnabled()) {
-    // LOGGER.debug("parseToString(exit): {}", reader.peek() != null ?
-    // XmlEventUtil.toString(reader.peek()) : "");
-    // }
-  }
-
-  private void parseStartElement(XMLEventReader2 reader, StartElement start, StringBuilder buffer)
-      throws XMLStreamException {
-    if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("parseStartElement(enter): {}", XmlEventUtil.toString(start));
-    }
-
-    // consume the start event
-    reader.nextEvent();
-
-    QName name = start.getName();
-    buffer.append('<')
-        .append(name.getLocalPart());
-    for (Attribute attribute : CollectionUtil.toIterable(
-        ObjectUtils.notNull(start.getAttributes()))) {
-      buffer
-          .append(' ')
-          .append(attribute.getName().getLocalPart())
-          .append("=\"")
-          .append(attribute.getValue())
-          .append('"');
-    }
-
-    XMLEvent next = reader.peek();
-    if (next != null && next.isEndElement()) {
-      buffer.append("/>");
-      // consume end element event
-      reader.nextEvent();
-    } else {
-      buffer.append('>');
-
-      // parse until the start's END_ELEMENT is reached
-      parseContents(reader, start, buffer);
-
-      buffer
-          .append("</")
-          .append(name.getLocalPart())
-          .append('>');
-
-      // the next event should be the start's END_ELEMENT
-      XmlEventUtil.assertNext(reader, XMLStreamConstants.END_ELEMENT, name);
-
-      // consume the start's END_ELEMENT
-      reader.nextEvent();
-    }
-
-    if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("parseStartElement(exit): {}", reader.peek() != null ? XmlEventUtil.toString(reader.peek()) : "");
-    }
-  }
-
-  private void parseContents(XMLEventReader2 reader, StartElement start, StringBuilder buffer)
-      throws XMLStreamException {
-    // if (LOGGER.isDebugEnabled()) {
-    // LOGGER.debug("parseContents(enter): {}",
-    // XmlEventUtil.toString(reader.peek()));
-    // }
-
-    XMLEvent event;
-    while (reader.hasNextEvent() && !(event = reader.peek()).isEndElement()) {
-      // // skip whitespace before the next list item
-      // event = XmlEventUtil.skipWhitespace(reader);
-
-      // if (LOGGER.isDebugEnabled()) {
-      // LOGGER.debug("parseContents(before): {}", XmlEventUtil.toString(event));
-      // }
-
-      if (event.isStartElement()) {
-        StartElement nextStart = event.asStartElement();
-        // QName nextName = nextStart.getName();
-        parseStartElement(reader, nextStart, buffer);
-
-        // if (LOGGER.isDebugEnabled()) {
-        // LOGGER.debug("parseContents(after): {}",
-        // XmlEventUtil.toString(reader.peek()));
-        // }
-
-        // assert XmlEventUtil.isNextEventEndElement(reader, nextName) :
-        // XmlEventUtil.toString(reader.peek());
-
-        // reader.nextEvent();
-      } else if (event.isCharacters()) {
-        Characters characters = event.asCharacters();
-        buffer.append(Escaping.escapeHtml(characters.getData(), true));
-        reader.nextEvent();
-      }
-    }
-
-    assert start == null
-        || XmlEventUtil.isEventEndElement(reader.peek(), ObjectUtils.notNull(start.getName())) : XmlEventUtil
-            .generateExpectedMessage(reader.peek(), XMLStreamConstants.END_ELEMENT, start.getName());
-
-    // if (LOGGER.isDebugEnabled()) {
-    // LOGGER.debug("parseContents(exit): {}", reader.peek() != null ?
-    // XmlEventUtil.toString(reader.peek()) : "");
-    // }
-  }
-
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.markup.flexmark;
+
+import com.vladsch.flexmark.util.sequence.Escaping;
+
+import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
+import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.codehaus.stax2.XMLEventReader2;
+
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.Attribute;
+import javax.xml.stream.events.Characters;
+import javax.xml.stream.events.StartElement;
+import javax.xml.stream.events.XMLEvent;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class XmlMarkupParser {
+  private static final Logger LOGGER = LogManager.getLogger(XmlMarkupParser.class);
+
+  @NonNull
+  public static final Set<String> BLOCK_ELEMENTS = ObjectUtils.notNull(
+      Set.of(
+          "h1",
+          "h2",
+          "h3",
+          "h4",
+          "h5",
+          "h6",
+          "ul",
+          "ol",
+          "pre",
+          "hr",
+          "blockquote",
+          "p",
+          "table",
+          "img"));
+
+  @NonNull
+  private static final XmlMarkupParser SINGLETON = new XmlMarkupParser();
+
+  /**
+   * Get the singleton markup parser instance.
+   *
+   * @return the instance
+   */
+  @SuppressWarnings("PMD.AvoidSynchronizedAtMethodLevel")
+  @NonNull
+  public static synchronized XmlMarkupParser instance() {
+    return SINGLETON;
+  }
+
+  private XmlMarkupParser() {
+    // disable construction
+  }
+
+  /**
+   * Parse a single line of markup from XHTML.
+   *
+   * @param reader
+   *          the XML event stream reader
+   * @return the markup string
+   * @throws XMLStreamException
+   *           if an error occurred while parsing
+   */
+  public MarkupLine parseMarkupline(XMLEventReader2 reader) throws XMLStreamException { // NOPMD - acceptable
+    StringBuilder buffer = new StringBuilder();
+    parseContents(reader, null, buffer);
+    String html = buffer.toString().trim();
+    return html.isEmpty() ? null : MarkupLine.fromHtml(html);
+  }
+
+  /**
+   * Parse a markup multiline from XHTML.
+   *
+   * @param reader
+   *          the XML event stream reader
+   * @return the markup string
+   * @throws XMLStreamException
+   *           if an error occurred while parsing
+   */
+  public MarkupMultiline parseMarkupMultiline(XMLEventReader2 reader) throws XMLStreamException {
+    StringBuilder buffer = new StringBuilder();
+    parseToString(reader, buffer);
+    String html = buffer.toString().trim();
+
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("XML->HTML: {}", html);
+    }
+    return html.isEmpty() ? null : MarkupMultiline.fromHtml(html);
+  }
+
+  /**
+   * Parse a markup multiline from XHTML.
+   *
+   * @param reader
+   *          the XML event stream reader
+   * @param buffer
+   *          the markup string buffer
+   * @throws XMLStreamException
+   *           if an error occurred while parsing
+   */
+  private void parseToString(XMLEventReader2 reader, StringBuilder buffer) // NOPMD - acceptable
+      throws XMLStreamException {
+    // if (LOGGER.isDebugEnabled()) {
+    // LOGGER.debug("parseToString(enter): {}",
+    // XmlEventUtil.toString(reader.peek()));
+    // }
+
+    outer: while (reader.hasNextEvent() && !reader.peek().isEndElement()) {
+      // skip whitespace before the next block element
+      XMLEvent nextEvent = XmlEventUtil.skipWhitespace(reader);
+
+      // if (LOGGER.isDebugEnabled()) {
+      // LOGGER.debug("parseToString: {}", XmlEventUtil.toString(nextEvent));
+      // }
+
+      if (nextEvent.isStartElement()) {
+        StartElement start = nextEvent.asStartElement();
+        QName name = start.getName();
+
+        // Note: the next element is not consumed. The called method is expected to
+        // consume it
+        if (BLOCK_ELEMENTS.contains(name.getLocalPart())) {
+          parseStartElement(reader, start, buffer);
+
+          // the next event should be the event after the start's END_ELEMENT
+          // assert XmlEventUtil.isNextEventEndElement(reader, name) :
+          // XmlEventUtil.toString(reader.peek());
+        } else {
+          // throw new IllegalStateException();
+          // stop parsing on first unrecognized event
+          break outer;
+        }
+      }
+      // reader.nextEvent();
+
+      // skip whitespace before the next block element
+      XmlEventUtil.skipWhitespace(reader);
+    }
+
+    // if (LOGGER.isDebugEnabled()) {
+    // LOGGER.debug("parseToString(exit): {}", reader.peek() != null ?
+    // XmlEventUtil.toString(reader.peek()) : "");
+    // }
+  }
+
+  private void parseStartElement(XMLEventReader2 reader, StartElement start, StringBuilder buffer)
+      throws XMLStreamException {
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("parseStartElement(enter): {}", XmlEventUtil.toString(start));
+    }
+
+    // consume the start event
+    reader.nextEvent();
+
+    QName name = start.getName();
+    buffer.append('<')
+        .append(name.getLocalPart());
+    for (Attribute attribute : CollectionUtil.toIterable(
+        ObjectUtils.notNull(start.getAttributes()))) {
+      buffer
+          .append(' ')
+          .append(attribute.getName().getLocalPart())
+          .append("=\"")
+          .append(attribute.getValue())
+          .append('"');
+    }
+
+    XMLEvent next = reader.peek();
+    if (next != null && next.isEndElement()) {
+      buffer.append("/>");
+      // consume end element event
+      reader.nextEvent();
+    } else {
+      buffer.append('>');
+
+      // parse until the start's END_ELEMENT is reached
+      parseContents(reader, start, buffer);
+
+      buffer
+          .append("</")
+          .append(name.getLocalPart())
+          .append('>');
+
+      // the next event should be the start's END_ELEMENT
+      XmlEventUtil.assertNext(reader, XMLStreamConstants.END_ELEMENT, name);
+
+      // consume the start's END_ELEMENT
+      reader.nextEvent();
+    }
+
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("parseStartElement(exit): {}", reader.peek() != null ? XmlEventUtil.toString(reader.peek()) : "");
+    }
+  }
+
+  private void parseContents(XMLEventReader2 reader, StartElement start, StringBuilder buffer)
+      throws XMLStreamException {
+    // if (LOGGER.isDebugEnabled()) {
+    // LOGGER.debug("parseContents(enter): {}",
+    // XmlEventUtil.toString(reader.peek()));
+    // }
+
+    XMLEvent event;
+    while (reader.hasNextEvent() && !(event = reader.peek()).isEndElement()) {
+      // // skip whitespace before the next list item
+      // event = XmlEventUtil.skipWhitespace(reader);
+
+      // if (LOGGER.isDebugEnabled()) {
+      // LOGGER.debug("parseContents(before): {}", XmlEventUtil.toString(event));
+      // }
+
+      if (event.isStartElement()) {
+        StartElement nextStart = event.asStartElement();
+        // QName nextName = nextStart.getName();
+        parseStartElement(reader, nextStart, buffer);
+
+        // if (LOGGER.isDebugEnabled()) {
+        // LOGGER.debug("parseContents(after): {}",
+        // XmlEventUtil.toString(reader.peek()));
+        // }
+
+        // assert XmlEventUtil.isNextEventEndElement(reader, nextName) :
+        // XmlEventUtil.toString(reader.peek());
+
+        // reader.nextEvent();
+      } else if (event.isCharacters()) {
+        Characters characters = event.asCharacters();
+        buffer.append(Escaping.escapeHtml(characters.getData(), true));
+        reader.nextEvent();
+      }
+    }
+
+    assert start == null
+        || XmlEventUtil.isEventEndElement(reader.peek(), ObjectUtils.notNull(start.getName())) : XmlEventUtil
+            .generateExpectedMessage(reader.peek(), XMLStreamConstants.END_ELEMENT, start.getName());
+
+    // if (LOGGER.isDebugEnabled()) {
+    // LOGGER.debug("parseContents(exit): {}", reader.peek() != null ?
+    // XmlEventUtil.toString(reader.peek()) : "");
+    // }
+  }
+
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/AbstractMarkupWriter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java
similarity index 84%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/AbstractMarkupWriter.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java
index 056edf3ca..f6841f767 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/AbstractMarkupWriter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java
@@ -24,7 +24,7 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.datatype.markup.flexmark; // NOPMD AST processor has many members
+package gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl; // NOPMD AST processor has many members
 
 import com.vladsch.flexmark.ast.AutoLink;
 import com.vladsch.flexmark.ast.BlockQuote;
@@ -64,6 +64,7 @@
 import com.vladsch.flexmark.util.sequence.Escaping;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.HtmlQuoteTagExtension.DoubleQuoteNode;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.IMarkupWriter;
 import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -85,6 +86,7 @@
 import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -105,16 +107,8 @@ public abstract class AbstractMarkupWriter<T, E extends Throwable> // NOPMD not
 
   static {
     ENTITY_MAP = new HashMap<>();
-    // special cases
+    // force writing of non-breaking spaces
     ENTITY_MAP.put("&npsb;", "&npsb;");
-    // ENTITY_MAP.put("&gt;", ">");
-    // normal cases
-    // ENTITY_MAP.put("&amp;", "&");
-    /*
-     * ENTITY_MAP.put("&lsquo;", "‘"); ENTITY_MAP.put("&rsquo;", "’"); ENTITY_MAP.put("&hellip;", "…");
-     * ENTITY_MAP.put("&mdash;", "—"); ENTITY_MAP.put("&ndash;", "–"); ENTITY_MAP.put("&ldquo;", "“");
-     * ENTITY_MAP.put("&rdquo;", "”"); ENTITY_MAP.put("&laquo;", "«"); ENTITY_MAP.put("&raquo;", "»");
-     */
   }
 
   @NonNull
@@ -126,33 +120,47 @@ public abstract class AbstractMarkupWriter<T, E extends Throwable> // NOPMD not
   @NonNull
   private final ListOptions options;
 
-  public AbstractMarkupWriter(@NonNull String namespace, @NonNull ListOptions options, @NonNull T stream) {
+  /**
+   * Construct a new markup writer.
+   *
+   * @param namespace
+   *          the XHTML namespace to use for elements
+   * @param options
+   *          list production options
+   * @param stream
+   *          the stream to write to
+   */
+  protected AbstractMarkupWriter(@NonNull String namespace, @NonNull ListOptions options, @NonNull T stream) {
     this.namespace = namespace;
     this.options = options;
     this.stream = stream;
   }
 
   @NonNull
-  protected String getNamespace() {
+  private String getNamespace() {
     return namespace;
   }
 
-  protected ListOptions getOptions() {
+  private ListOptions getOptions() {
     return options;
   }
 
+  /**
+   * Get the underlying stream to write to.
+   *
+   * @return the stream
+   */
   @NonNull
   protected T getStream() {
     return stream;
   }
 
-  @Override
   @NonNull
-  public QName asQName(@NonNull String localName) {
+  private QName asQName(@NonNull String localName) {
     return new QName(getNamespace(), localName);
   }
 
-  protected void visitChildren(
+  private void visitChildren(
       @NonNull Node parentNode,
       @NonNull ChildHandler<T, E> childHandler) throws E {
     for (Node node : parentNode.getChildren()) {
@@ -161,7 +169,7 @@ protected void visitChildren(
     }
   }
 
-  protected void writePrecedingNewline(@NonNull Block node) throws E {
+  private void writePrecedingNewline(@NonNull Block node) throws E {
     Node prev = node.getPrevious();
     if (prev != null
         || !(node.getParent() instanceof com.vladsch.flexmark.util.ast.Document)) {
@@ -169,7 +177,7 @@ protected void writePrecedingNewline(@NonNull Block node) throws E {
     }
   }
 
-  protected void writeTrailingNewline(@NonNull Block node) throws E {
+  private void writeTrailingNewline(@NonNull Block node) throws E {
     Node next = node.getNext();
     if (next != null && !next.isOrDescendantOfType(Block.class) // handled by preceding block
         || next == null && !(node.getParent() instanceof com.vladsch.flexmark.util.ast.Document)) {
@@ -177,12 +185,35 @@ protected void writeTrailingNewline(@NonNull Block node) throws E {
     }
   }
 
+  /**
+   * Write an HTML element with the provided local name.
+   *
+   * @param localName
+   *          the element name
+   * @param node
+   *          the markup node related to the element
+   * @param attributes
+   *          attributes associated with the element to also write
+   * @param childHandler
+   *          a handler used to process child node content or {@code null}
+   * @throws E
+   *           if an error occurred while writing the markup
+   */
   @Override
-  public final void writeElement(
-      QName qname,
-      Node node,
-      Map<String, String> attributes,
-      ChildHandler<T, E> childHandler) throws E {
+  public void writeElement(
+      @NonNull String localName,
+      @NonNull Node node,
+      @NonNull Map<String, String> attributes,
+      @Nullable ChildHandler<T, E> childHandler) throws E {
+    QName qname = asQName(localName);
+    writeElement(qname, node, attributes, childHandler);
+  }
+
+  private void writeElement(
+      @NonNull QName qname,
+      @NonNull Node node,
+      @NonNull Map<String, String> attributes,
+      @Nullable ChildHandler<T, E> childHandler) throws E {
     if (node.hasChildren()) {
       writeElementStart(qname, attributes);
       if (childHandler != null) {
@@ -194,6 +225,65 @@ public final void writeElement(
     }
   }
 
+  @Override
+  public void writeEmptyElement(
+      @NonNull String localName,
+      @NonNull Map<String, String> attributes) throws E {
+    QName qname = asQName(localName);
+    writeEmptyElement(qname, attributes);
+  }
+
+  /**
+   * Write an empty element with the provided qualified name and attributes.
+   *
+   * @param qname
+   *          the qualified name to use for the element name
+   * @param attributes
+   *          the attributes
+   * @throws E
+   *           if an error occurred while writing
+   */
+  protected abstract void writeEmptyElement(
+      @NonNull QName qname,
+      @NonNull Map<String, String> attributes) throws E;
+
+  /**
+   * Write a start element with the provided qualified name and no attributes.
+   *
+   * @param qname
+   *          the qualified name to use for the element name
+   * @throws E
+   *           if an error occurred while writing
+   */
+  private void writeElementStart(
+      @NonNull QName qname) throws E {
+    writeElementStart(qname, CollectionUtil.emptyMap());
+  }
+
+  /**
+   * Write a start element with the provided qualified name and attributes.
+   *
+   * @param qname
+   *          the qualified name to use for the element name
+   * @param attributes
+   *          the attributes
+   * @throws E
+   *           if an error occurred while writing
+   */
+  protected abstract void writeElementStart(
+      @NonNull QName qname,
+      @NonNull Map<String, String> attributes) throws E;
+
+  /**
+   * Write an end element with the provided qualified name.
+   *
+   * @param qname
+   *          the qualified name to use for the element name
+   * @throws E
+   *           if an error occurred while writing
+   */
+  protected abstract void writeElementEnd(@NonNull QName qname) throws E;
+
   @SuppressWarnings({
       "unchecked",
       "unused",
@@ -270,6 +360,14 @@ private void writeHtmlEntity(String entityText) throws E {
     }
   }
 
+  /**
+   * Write an HTML entity.
+   *
+   * @param text
+   *          the entity text
+   * @throws E
+   *           if an error occurred while writing
+   */
   protected void writeHtmlEntityInternal(@NonNull String text) throws E {
     writeText(text);
   }
@@ -656,7 +754,18 @@ public void writeBlockQuote(BlockQuote node, ChildHandler<T, E> childHandler) th
   }
 
   @Override
-  public void writeList(QName qname, ListBlock node, ChildHandler<T, E> listItemHandler) throws E {
+  public void writeList(
+      @NonNull String localName,
+      @NonNull ListBlock node,
+      @NonNull ChildHandler<T, E> listItemHandler) throws E {
+    QName qname = asQName(localName);
+    writeList(qname, node, listItemHandler);
+  }
+
+  private void writeList(
+      @NonNull QName qname,
+      @NonNull ListBlock node,
+      @NonNull ChildHandler<T, E> listItemHandler) throws E {
     Map<String, String> attributes = new LinkedHashMap<>(); // NOPMD local use; thread-safe
     if (node instanceof OrderedList) {
       OrderedList ol = (OrderedList) node;
@@ -678,8 +787,9 @@ public void writeList(QName qname, ListBlock node, ChildHandler<T, E> listItemHa
     writeTrailingNewline(node);
   }
 
-  @Override
-  public void writeListItem(ListItem node, ChildHandler<T, E> listItemHandler) throws E {
+  private void writeListItem(
+      @NonNull ListItem node,
+      @NonNull ChildHandler<T, E> listItemHandler) throws E {
     QName qname = asQName("li");
     writePrecedingNewline(node);
     writeElementStart(qname);
@@ -718,9 +828,17 @@ public void writeComment(HtmlCommentBlock node) throws E {
 
   }
 
+  /**
+   * Write a comment.
+   *
+   * @param text
+   *          the comment text
+   * @throws E
+   *           if an error occurred while writing
+   */
   protected abstract void writeComment(@NonNull CharSequence text) throws E;
 
-  protected static class NodeVisitorException
+  private static class NodeVisitorException
       extends IllegalStateException {
     /**
      * the serial version uid.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/Date.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/Date.java
index 7728a397b..290b67be4 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/Date.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/Date.java
@@ -1,54 +1,54 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.object;
-
-import java.time.ZonedDateTime;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class Date // NOPMD - intentional
-    extends AbstractAmbiguousTemporal<Date> {
-
-  /**
-   * Construct a new date object. This type supports ambiguous dates that were
-   * provided without a time zone.
-   *
-   * @param value
-   *          the date value
-   * @param hasTimeZone
-   *          {@code true} if the date is intended to have an associated time zone
-   *          or {@code false} otherwise
-   */
-  public Date(@NonNull ZonedDateTime value, boolean hasTimeZone) {
-    super(value, hasTimeZone);
-  }
-
-  @Override
-  public Date copy() {
-    return new Date(getValue(), hasTimeZone());
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.object;
+
+import java.time.ZonedDateTime;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class Date // NOPMD - intentional
+    extends AbstractAmbiguousTemporal<Date> {
+
+  /**
+   * Construct a new date object. This type supports ambiguous dates that were
+   * provided without a time zone.
+   *
+   * @param value
+   *          the date value
+   * @param hasTimeZone
+   *          {@code true} if the date is intended to have an associated time zone
+   *          or {@code false} otherwise
+   */
+  public Date(@NonNull ZonedDateTime value, boolean hasTimeZone) {
+    super(value, hasTimeZone);
+  }
+
+  @Override
+  public Date copy() {
+    return new Date(getValue(), hasTimeZone());
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/DateTime.java b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/DateTime.java
index e3bd4593e..5c48fc262 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/DateTime.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/object/DateTime.java
@@ -1,54 +1,54 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.object;
-
-import java.time.ZonedDateTime;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public class DateTime
-    extends AbstractAmbiguousTemporal<DateTime> {
-
-  /**
-   * Construct a new date/time object. This type supports ambiguous dates/times
-   * that were provided without a time zone.
-   *
-   * @param value
-   *          the date/time value
-   * @param hasTimeZone
-   *          {@code true} if the date/time is intended to have an associated time
-   *          zone or {@code false} otherwise
-   */
-  public DateTime(@NonNull ZonedDateTime value, boolean hasTimeZone) {
-    super(value, hasTimeZone);
-  }
-
-  @Override
-  public DateTime copy() {
-    return new DateTime(getValue(), hasTimeZone());
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.object;
+
+import java.time.ZonedDateTime;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class DateTime
+    extends AbstractAmbiguousTemporal<DateTime> {
+
+  /**
+   * Construct a new date/time object. This type supports ambiguous dates/times
+   * that were provided without a time zone.
+   *
+   * @param value
+   *          the date/time value
+   * @param hasTimeZone
+   *          {@code true} if the date/time is intended to have an associated time
+   *          zone or {@code false} otherwise
+   */
+  public DateTime(@NonNull ZonedDateTime value, boolean hasTimeZone) {
+    super(value, hasTimeZone);
+  }
+
+  @Override
+  public DateTime copy() {
+    return new DateTime(getValue(), hasTimeZone());
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/AbstractCodedMetapathException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/AbstractCodedMetapathException.java
index 64b1b3399..5b822836e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/AbstractCodedMetapathException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/AbstractCodedMetapathException.java
@@ -97,7 +97,7 @@ public String getMessage() {
    *
    * @return the error code value
    */
-  protected int getCode() {
+  public int getCode() {
     return code;
   }
 
@@ -106,7 +106,7 @@ protected int getCode() {
    *
    * @return the error code family
    */
-  protected abstract String getCodePrefix();
+  public abstract String getCodePrefix();
 
   /**
    * Get a combination of the error code family and value.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java
index 0b13b5479..9069ed041 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicContext.java
@@ -30,8 +30,8 @@
 import gov.nist.secauto.metaschema.core.configuration.IConfiguration;
 import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
 import gov.nist.secauto.metaschema.core.metapath.function.DefaultFunction.CallingContext;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction.FunctionProperty;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.model.IUriResolver;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -45,7 +45,10 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 // TODO: add support for in-scope namespaces
 /**
@@ -54,17 +57,24 @@
  */
 public class DynamicContext { // NOPMD - intentional data class
   @NonNull
-  private final Map<String, ISequence<?>> letVariableMap;
+  private final Map<QName, ISequence<?>> letVariableMap;
   @NonNull
   private final SharedState sharedState;
 
   /**
-   * Construct a new Metapath dynamic context.
+   * Construct a new dynamic context with a default static context.
+   */
+  public DynamicContext() {
+    this(StaticContext.instance());
+  }
+
+  /**
+   * Construct a new Metapath dynamic context using the provided static context.
    *
    * @param staticContext
    *          the Metapath static context
    */
-  DynamicContext(@NonNull StaticContext staticContext) {
+  public DynamicContext(@NonNull StaticContext staticContext) {
     this.letVariableMap = new ConcurrentHashMap<>();
     this.sharedState = new SharedState(staticContext);
   }
@@ -83,7 +93,9 @@ private static class SharedState {
     private final ZonedDateTime currentDateTime;
     @NonNull
     private final Map<URI, IDocumentNodeItem> availableDocuments;
+    @NonNull
     private final Map<CallingContext, ISequence<?>> functionResultCache;
+    @Nullable
     private CachingLoader documentLoader;
     @NonNull
     private final IMutableConfiguration<MetapathEvaluationFeature<?>> configuration;
@@ -103,11 +115,12 @@ public SharedState(@NonNull StaticContext staticContext) {
   }
 
   /**
-   * Generate a new dynamic context that is based on this object.
+   * Generate a new dynamic context that is a copy of this dynamic context.
    * <p>
    * This method can be used to create a new sub-context where changes can be made
    * without affecting this context. This is useful for setting information that
-   * is only used in a limited evaluation scope, such as variables.
+   * is only used in a limited evaluation sub-scope, such as for handling variable
+   * assignment.
    *
    * @return a new dynamic context
    */
@@ -146,43 +159,137 @@ public ZonedDateTime getCurrentDateTime() {
     return sharedState.currentDateTime;
   }
 
+  /**
+   * Get the mapping of loaded documents from the document URI to the document
+   * node.
+   *
+   * @return the map of document URIs to document nodes
+   */
   @SuppressWarnings("null")
   @NonNull
-  public Map<URI, INodeItem> getAvailableDocuments() {
+  public Map<URI, IDocumentNodeItem> getAvailableDocuments() {
     return Collections.unmodifiableMap(sharedState.availableDocuments);
   }
 
+  /**
+   * Get the document loader assigned to this dynamic context.
+   *
+   * @return the loader
+   * @throws DynamicMetapathException
+   *           with an error code
+   *           {@link DynamicMetapathException#DYNAMIC_CONTEXT_ABSENT} if a
+   *           document loader is not configured for this dynamic context
+   */
+  @NonNull
   public IDocumentLoader getDocumentLoader() {
-    return sharedState.documentLoader;
+    IDocumentLoader retval = sharedState.documentLoader;
+    if (retval == null) {
+      throw new DynamicMetapathException(DynamicMetapathException.DYNAMIC_CONTEXT_ABSENT,
+          "No document loader configured for the dynamic context.");
+    }
+    return retval;
   }
 
+  /**
+   * Assign a document loader to this dynamic context.
+   *
+   * @param documentLoader
+   *          the document loader to assign
+   */
   public void setDocumentLoader(@NonNull IDocumentLoader documentLoader) {
     this.sharedState.documentLoader = new CachingLoader(documentLoader);
   }
 
+  /**
+   * Get the cached function call result for evaluating a function that has the
+   * property {@link FunctionProperty#DETERMINISTIC}.
+   *
+   * @param callingContext
+   *          the function calling context information that distinguishes the call
+   *          from any other call
+   * @return the cached result sequence for the function call
+   */
+  @Nullable
   public ISequence<?> getCachedResult(@NonNull CallingContext callingContext) {
     return sharedState.functionResultCache.get(callingContext);
   }
 
+  /**
+   * Cache a function call result for a that has the property
+   * {@link FunctionProperty#DETERMINISTIC}.
+   *
+   * @param callingContext
+   *          the calling context information that distinguishes the call from any
+   *          other call
+   * @param result
+   *          the function call result
+   */
+  public void cacheResult(@NonNull CallingContext callingContext, @NonNull ISequence<?> result) {
+    ISequence<?> old = sharedState.functionResultCache.put(callingContext, result);
+    assert old == null;
+  }
+
+  /**
+   * Used to disable the evaluation of predicate expressions during Metapath
+   * evaluation.
+   * <p>
+   * This can be useful for determining the potential targets identified by a
+   * Metapath expression as a partial evaluation, without evaluating that these
+   * targets match the predicate.
+   *
+   * @return this dynamic context
+   */
   @NonNull
   public DynamicContext disablePredicateEvaluation() {
     this.sharedState.configuration.disableFeature(MetapathEvaluationFeature.METAPATH_EVALUATE_PREDICATES);
     return this;
   }
 
+  /**
+   * Used to enable the evaluation of predicate expressions during Metapath
+   * evaluation.
+   * <p>
+   * This is the default behavior if unchanged.
+   *
+   * @return this dynamic context
+   */
   @NonNull
-  public IConfiguration<MetapathEvaluationFeature<?>> getConfiguration() {
-    return sharedState.configuration;
+  public DynamicContext enablePredicateEvaluation() {
+    this.sharedState.configuration.enableFeature(MetapathEvaluationFeature.METAPATH_EVALUATE_PREDICATES);
+    return this;
   }
 
-  public void cacheResult(@NonNull CallingContext callingContext, @NonNull ISequence<?> result) {
-    ISequence<?> old = sharedState.functionResultCache.put(callingContext, result);
-    assert old == null;
+  /**
+   * Get the Metapath evaluation configuration.
+   *
+   * @return the configuration
+   */
+  @NonNull
+  public IConfiguration<MetapathEvaluationFeature<?>> getConfiguration() {
+    return sharedState.configuration;
   }
 
+  /**
+   * Get the sequence value assigned to a let variable with the provided qualified
+   * name.
+   *
+   * @param name
+   *          the variable qualified name
+   * @return the non-null variable value
+   * @throws MetapathException
+   *           of the variable has not been assigned or if the variable value is
+   *           {@code null}
+   */
   @NonNull
-  public ISequence<?> getVariableValue(@NonNull String name) {
-    return ObjectUtils.requireNonNull(letVariableMap.get(name));
+  public ISequence<?> getVariableValue(@NonNull QName name) {
+    ISequence<?> retval = letVariableMap.get(name);
+    if (retval == null) {
+      if (!letVariableMap.containsKey(name)) {
+        throw new MetapathException(String.format("Variable '%s' not defined in context.", name));
+      }
+      throw new MetapathException(String.format("Variable '%s' has null contents.", name));
+    }
+    return retval;
   }
 
   /**
@@ -193,7 +300,7 @@ public ISequence<?> getVariableValue(@NonNull String name) {
    * @param boundValue
    *          the value to bind to the variable
    */
-  public void bindVariableValue(@NonNull String name, @NonNull ISequence<?> boundValue) {
+  public void bindVariableValue(@NonNull QName name, @NonNull ISequence<?> boundValue) {
     letVariableMap.put(name, boundValue);
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicMetapathException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicMetapathException.java
index df5f8fcc0..2b432fad5 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicMetapathException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/DynamicMetapathException.java
@@ -105,7 +105,7 @@ public DynamicMetapathException(int code, Throwable cause) {
   }
 
   @Override
-  protected String getCodePrefix() {
+  public String getCodePrefix() {
     return "MPDY";
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/EQNameUtils.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/EQNameUtils.java
new file mode 100644
index 000000000..7f0201820
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/EQNameUtils.java
@@ -0,0 +1,159 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class EQNameUtils {
+  private static final Pattern URI_QUALIFIED_NAME = Pattern.compile("^Q\\{([^{}]*)\\}(.+)$");
+  private static final Pattern LEXICAL_NAME = Pattern.compile("^(?:([^:]+):)?(.+)$");
+  private static final Pattern NCNAME = Pattern.compile(String.format("^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$"));
+
+  private EQNameUtils() {
+    // disable construction
+  }
+
+  /**
+   * Parse a name as a qualified name.
+   * <p>
+   * The name can be:
+   * <ul>
+   * <li>A URI qualified name of the form <code>Q{URI}name</code>, where the URI
+   * represents the namespace</li>
+   * <li>A lexical name of the forms <code>prefix:name</code> or
+   * <code>name</code>, where the prefix represents the namespace</li>
+   * </ul>
+   *
+   * @param name
+   *          the name to parse
+   * @param resolver
+   *          the prefix resolver to use to determine the namespace for a given
+   *          prefix
+   * @return the parsed qualified name
+   */
+  @NonNull
+  public static QName parseName(
+      @NonNull String name,
+      @NonNull IEQNamePrefixResolver resolver) {
+    Matcher matcher = URI_QUALIFIED_NAME.matcher(name);
+    return matcher.matches()
+        ? newUriQualifiedName(matcher)
+        : parseLexicalQName(name, resolver);
+  }
+
+  /**
+   * Parse a URI qualified name.
+   * <p>
+   * The name is expected to be a URI qualified name of the form
+   * <code>{URI}name</code>, where the URI represents the namespace.
+   *
+   * @param name
+   *          the name to parse
+   * @return the parsed qualified name
+   */
+  @NonNull
+  public static QName parseUriQualifiedName(@NonNull String name) {
+    Matcher matcher = URI_QUALIFIED_NAME.matcher(name);
+    if (!matcher.matches()) {
+      throw new IllegalArgumentException(
+          String.format("The name '%s' is not a valid BracedURILiteral of the form: Q{URI}local-name", name));
+    }
+    return newUriQualifiedName(matcher);
+  }
+
+  @NonNull
+  private static QName newUriQualifiedName(@NonNull Matcher matcher) {
+    return new QName(matcher.group(1), matcher.group(2));
+  }
+
+  /**
+   * Parse a lexical name as a qualified name.
+   * <p>
+   * The name is expected to be a lexical name of the forms
+   * <code>prefix:name</code> or <code>name</code>, where the prefix represents
+   * the namespace.
+   *
+   * @param name
+   *          the name to parse
+   * @param resolver
+   *          the prefix resolver to use to determine the namespace for a given
+   *          prefix
+   * @return the parsed qualified name
+   */
+  @NonNull
+  public static QName parseLexicalQName(
+      @NonNull String name,
+      @NonNull IEQNamePrefixResolver resolver) {
+    Matcher matcher = LEXICAL_NAME.matcher(name);
+    if (!matcher.matches()) {
+      throw new IllegalArgumentException(
+          String.format("The name '%s' is not a valid lexical QName of the form: prefix:local-name or local-name",
+              name));
+    }
+    String prefix = matcher.group(1);
+
+    if (prefix == null) {
+      prefix = XMLConstants.DEFAULT_NS_PREFIX;
+    }
+
+    String namespace = resolver.resolve(prefix);
+    return new QName(namespace, matcher.group(2), prefix);
+  }
+
+  /**
+   * Determine if the name is a non-colonized name.
+   *
+   * @param name
+   *          the name to test
+   * @return {@code true} if the name is not colonized, or {@code false} otherwise
+   */
+  public static boolean isNcName(@NonNull String name) {
+    return NCNAME.matcher(name).matches();
+  }
+
+  /**
+   * Provides a callback for resolving namespace prefixes.
+   */
+  @FunctionalInterface
+  public interface IEQNamePrefixResolver {
+    /**
+     * Get the URI string for the provided namespace prefix.
+     *
+     * @param prefix
+     *          the namespace prefix
+     * @return the URI string
+     */
+    @NonNull
+    String resolve(@NonNull String prefix);
+  }
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundAnnotatedJavaField.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ICollectionValue.java
similarity index 61%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundAnnotatedJavaField.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ICollectionValue.java
index b5a38f1da..e3d330b4a 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundAnnotatedJavaField.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ICollectionValue.java
@@ -24,55 +24,51 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.impl;
+package gov.nist.secauto.metaschema.core.metapath;
 
-import gov.nist.secauto.metaschema.databind.model.IFeatureJavaField;
-import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
+import java.util.stream.Stream;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public abstract class AbstractBoundAnnotatedJavaField<A extends Annotation> implements IFeatureJavaField {
-  @NonNull
-  private final Field javaField;
-  @NonNull
-  private final A annotation;
-
+public interface ICollectionValue {
   /**
-   * Construct a new binding between a Java field and a binding Java annotation.
+   * Get the collection value as a sequence.
+   * <p>
+   * If the collection value is a sequence, then the sequence is returned.
    *
-   * @param javaField
-   *          the bound Java field
-   * @param annotationClass
-   *          the binding annotation Java class
+   * @return the resulting sequence
    */
-  protected AbstractBoundAnnotatedJavaField(
-      @NonNull Field javaField,
-      @NonNull Class<A> annotationClass) {
-    this.javaField = javaField;
-    this.annotation = ModelUtil.getAnnotation(javaField, annotationClass);
-  }
+  // TODO: rename to toSequence and resolve conflicting methods?
+  @NonNull
+  ISequence<?> asSequence();
 
   /**
-   * Get the bound Java field.
+   * Get the stream of items for the collection value.
+   * <p>
+   * If the collection value is a sequence, then the items in the collection are
+   * returned.
    *
-   * @return the bound Java field
+   * @param value
+   *          the collection value
+   * @return the sequence of related items
    */
-  @Override
   @NonNull
-  public Field getField() {
-    return javaField;
+  static Stream<? extends IItem> normalizeAsItems(@NonNull ICollectionValue value) {
+    return value instanceof IItem
+        ? ObjectUtils.notNull(Stream.of((IItem) value))
+        : value.asSequence().stream();
   }
 
   /**
-   * Get the binding Java annotation.
+   * Get the stream of items for the collection value.
+   * <p>
+   * If the collection value contains items, then these items are returned.
    *
-   * @return the binding Java annotation
+   * @return a stream of related items
    */
   @NonNull
-  public A getAnnotation() {
-    return annotation;
-  }
+  Stream<? extends IItem> flatten();
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBinding.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IPrintable.java
similarity index 88%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBinding.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IPrintable.java
index fffff52dd..0cae7cbcc 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBinding.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/IPrintable.java
@@ -24,16 +24,16 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+package gov.nist.secauto.metaschema.core.metapath;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public interface IBinding {
-  @NonNull
-  Object getBinding();
-
+public interface IPrintable {
+  /**
+   * Get the string value.
+   *
+   * @return the string value
+   */
   @NonNull
-  INodeItem getBoundNodeItem();
+  String asString();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ISequence.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ISequence.java
index 569f3ccac..145df6011 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ISequence.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ISequence.java
@@ -26,20 +26,22 @@
 
 package gov.nist.secauto.metaschema.core.metapath;
 
+import gov.nist.secauto.metaschema.core.metapath.impl.AbstractSequence;
+import gov.nist.secauto.metaschema.core.metapath.impl.SequenceN;
+import gov.nist.secauto.metaschema.core.metapath.impl.SingletonSequence;
+import gov.nist.secauto.metaschema.core.metapath.impl.StreamSequence;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.BinaryOperator;
-import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collector;
@@ -54,125 +56,142 @@
  * Items is a sequence are typically ordered based on their position in the
  * original node graph based on a depth first ordering.
  *
- * @param <ITEM_TYPE>
+ * @param <ITEM>
  *          the Java type of the items in a sequence
  */
-public interface ISequence<ITEM_TYPE extends IItem> extends List<ITEM_TYPE> {
-  @SuppressWarnings("rawtypes")
-  ISequence EMPTY = new EmptyListImpl<>();
-
+@SuppressWarnings("PMD.ShortMethodName")
+public interface ISequence<ITEM extends IItem> extends List<ITEM>, IPrintable, ICollectionValue {
   /**
    * Get an empty sequence.
    *
-   * @param <ITEM_TYPE>
+   * @param <T>
    *          the item type
    * @return the empty sequence
    */
-  @SuppressWarnings({ "unchecked", "null" })
+  @SuppressWarnings("null")
   @NonNull
-  static <ITEM_TYPE extends IItem> ISequence<ITEM_TYPE> empty() {
-    return EMPTY;
+  static <T extends IItem> ISequence<T> empty() {
+    return AbstractSequence.empty();
+  }
+
+  @Override
+  default Iterator<ITEM> iterator() {
+    return getValue().listIterator();
   }
 
   /**
-   * Construct a new sequence containing the provided {@code item}.
-   * <p>
-   * If the item is {@code null} and empty sequence will be created.
+   * Get the items in this sequence as a {@link List}.
    *
-   * @param <ITEM_TYPE>
-   *          the type of items contained in the sequence.
-   * @param item
-   *          the item to add to the sequence
-   * @return the new sequence
+   * @return a list containing all the items of the sequence
    */
   @NonNull
-  static <ITEM_TYPE extends IItem> ISequence<ITEM_TYPE> of( // NOPMD - intentional
-      @Nullable ITEM_TYPE item) {
-    ISequence<ITEM_TYPE> retval;
-    if (item == null) {
-      retval = empty();
-    } else {
-      retval = new SingletonSequenceImpl<>(item);
-    }
-    return retval;
-  }
+  List<ITEM> getValue();
 
   /**
-   * Construct a new sequence containing the provided {@code items}.
+   * Get the items in this sequence as a {@link Stream}.
    *
-   * @param <ITEM_TYPE>
-   *          the type of items contained in the sequence.
-   * @param items
-   *          the items to add to the sequence
-   * @return the new sequence
+   * @return a stream containing all the items of the sequence
    */
-  @SafeVarargs
+  @Override
   @NonNull
-  static <ITEM_TYPE extends IItem> ISequence<ITEM_TYPE> of( // NOPMD - intentional
-      @NonNull ITEM_TYPE... items) {
-    return of(ObjectUtils.notNull(Arrays.asList(items)));
-  }
+  Stream<ITEM> stream();
 
   /**
-   * Construct a new sequence containing the provided {@code items}.
+   * Retrieves the first item in a sequence.
+   * <p>
+   * If the sequence is empty, a {@code null} result is returned. If
+   * requireSingleton is {@code true} and the sequence contains more than one
+   * item, a {@link TypeMetapathException} is thrown.
    *
-   * @param <ITEM_TYPE>
-   *          the type of items contained in the sequence.
+   * @param <T>
+   *          the item type to return derived from the provided sequence
    * @param items
-   *          the items to add to the sequence
-   * @return the new sequence
+   *          the sequence to retrieve the first item from
+   * @param requireSingleton
+   *          if {@code true} then a {@link TypeMetapathException} is thrown if
+   *          the sequence contains more than one item
+   * @return {@code null} if the sequence is empty, or the item otherwise
+   * @throws TypeMetapathException
+   *           if the sequence contains more than one item and requireSingleton is
+   *           {@code true}
    */
-  @NonNull
-  static <ITEM_TYPE extends IItem> ISequence<ITEM_TYPE> of( // NOPMD - intentional
-      @NonNull List<ITEM_TYPE> items) {
-    ISequence<ITEM_TYPE> retval;
-    if (items.isEmpty()) {
-      retval = empty();
-    } else if (items.size() == 1) {
-      retval = new SingletonSequenceImpl<>(ObjectUtils.notNull(items.iterator().next()));
-    } else {
-      retval = new ListSequenceImpl<>(items);
-    }
-    return retval;
+  static <T extends IItem> T getFirstItem(@NonNull ISequence<T> items, boolean requireSingleton) {
+    return getFirstItem(items.stream(), requireSingleton);
   }
 
   /**
-   * Construct a new sequence containing the provided {@code items}.
+   * Retrieves the first item in a stream of items.
+   * <p>
+   * If the sequence is empty, a {@code null} result is returned. If
+   * requireSingleton is {@code true} and the sequence contains more than one
+   * item, a {@link TypeMetapathException} is thrown.
    *
-   * @param <ITEM_TYPE>
-   *          the type of items contained in the sequence.
+   * @param <T>
+   *          the item type to return derived from the provided sequence
    * @param items
-   *          the items to add to the sequence
-   * @return the new sequence
+   *          the sequence to retrieve the first item from
+   * @param requireSingleton
+   *          if {@code true} then a {@link TypeMetapathException} is thrown if
+   *          the sequence contains more than one item
+   * @return {@code null} if the sequence is empty, or the item otherwise
+   * @throws TypeMetapathException
+   *           if the sequence contains more than one item and requireSingleton is
+   *           {@code true}
    */
-  // TODO: remove null check on callers
-  @NonNull
-  static <ITEM_TYPE extends IItem> ISequence<ITEM_TYPE> of( // NOPMD - intentional
-      Stream<ITEM_TYPE> items) {
-    return items == null ? empty() : new StreamSequenceImpl<>(items);
-  }
-
-  @Override
-  default Iterator<ITEM_TYPE> iterator() {
-    return asList().listIterator();
+  static <T extends IItem> T getFirstItem(@NonNull Stream<T> items, boolean requireSingleton) {
+    return items.limit(2)
+        .reduce((t, u) -> {
+          if (requireSingleton) {
+            throw new InvalidTypeMetapathException(
+                null,
+                String.format("sequence expected to contain only one item, but found multiple"));
+          }
+          return t;
+        }).orElse(null);
   }
 
   /**
-   * Get the items in this sequence as a {@link List}.
+   * Retrieves the first item in this sequence.
+   * <p>
+   * If the sequence is empty, a {@code null} result is returned. If
+   * requireSingleton is {@code true} and the sequence contains more than one
+   * item, a {@link TypeMetapathException} is thrown.
    *
-   * @return a list containing all the items of the sequence
+   * @param requireSingleton
+   *          if {@code true} then a {@link TypeMetapathException} is thrown if
+   *          the sequence contains more than one item
+   * @return {@code null} if the sequence is empty, or the item otherwise
+   * @throws TypeMetapathException
+   *           if the sequence contains more than one item and requireSingleton is
+   *           {@code true}
    */
-  @NonNull
-  List<ITEM_TYPE> asList();
+  @Nullable
+  default ITEM getFirstItem(boolean requireSingleton) {
+    return getFirstItem(this, requireSingleton);
+  }
 
   /**
-   * Get the items in this sequence as a {@link Stream}.
+   * Get this sequence as a collection value.
    *
-   * @return a stream containing all the items of the sequence
+   * @return the collection value
    */
-  // TODO: rename to "stream"
   @NonNull
-  Stream<ITEM_TYPE> asStream();
+  default ICollectionValue toCollectionValue() {
+    ICollectionValue retval;
+    switch (size()) {
+    case 0:
+      retval = empty();
+      break;
+    case 1:
+      // get the singleton item
+      retval = ObjectUtils.notNull(stream().findFirst().get());
+      break;
+    default:
+      // get this sequence of 2 or more items
+      retval = this;
+    }
+    return retval;
+  }
 
   /**
    * Get a stream guaranteed to be backed by a list.
@@ -180,46 +199,16 @@ default Iterator<ITEM_TYPE> iterator() {
    * @return the stream
    */
   @NonNull
-  default Stream<ITEM_TYPE> safeStream() {
-    return ObjectUtils.notNull(asList().stream());
+  default Stream<ITEM> safeStream() {
+    return ObjectUtils.notNull(getValue().stream());
   }
 
-  /**
-   * This optional operation ensures that a list is used to back this sequence.
-   * <p>
-   * If a stream is currently backing this sequence, the stream will be collected
-   * into a list. This ensures the sequence can be visited multiple times.
-   *
-   * @return the resulting sequence
-   */
-  @NonNull
-  ISequence<ITEM_TYPE> collect();
-
-  /**
-   * Determine if this sequence is empty.
-   *
-   * @return {@code true} if the sequence contains no items, or {@code false}
-   *         otherwise
-   */
-  @Override
-  boolean isEmpty();
-
-  /**
-   * Get the count of items in this sequence.
-   *
-   * @return the count of items
-   */
+  @SuppressWarnings("null")
   @Override
-  int size();
-
-  /**
-   * Iterate over each item in the sequence using the provided {@code action}.
-   *
-   * @param action
-   *          code to execute for each item
-   */
-  @Override
-  void forEach(Consumer<? super ITEM_TYPE> action);
+  default Stream<? extends IItem> flatten() {
+    // TODO: Is a safe stream needed here?
+    return safeStream();
+  }
 
   /**
    * A {@link Collector} implementation to generates a sequence from a stream of
@@ -240,7 +229,7 @@ public Supplier<List<ITEM_TYPE>> supplier() {
 
       @Override
       public BiConsumer<List<ITEM_TYPE>, ITEM_TYPE> accumulator() {
-        return (list, value) -> list.add(value);
+        return List::add;
       }
 
       @Override
@@ -253,7 +242,7 @@ public BinaryOperator<List<ITEM_TYPE>> combiner() {
 
       @Override
       public Function<List<ITEM_TYPE>, ISequence<ITEM_TYPE>> finisher() {
-        return list -> of(ObjectUtils.notNull(list));
+        return list -> ofCollection(ObjectUtils.notNull(list));
       }
 
       @Override
@@ -263,6 +252,11 @@ public Set<Characteristics> characteristics() {
     };
   }
 
+  @Override
+  default ISequence<ITEM> asSequence() {
+    return this;
+  }
+
   /**
    * Apply the provided {@code mapFunction} to each item in the sequence.
    *
@@ -280,107 +274,352 @@ static <T extends R, R extends IItem> ISequence<R> map(
       @NonNull Function<T, R> mapFunction,
       @NonNull ISequence<T> seq) {
     return seq.safeStream()
-        .map(item -> mapFunction.apply(item))
+        .map(mapFunction::apply)
         .collect(toSequence());
   }
 
-  @Override
-  default boolean contains(Object obj) {
-    return asList().contains(obj);
-  }
-
-  @Override
-  default Object[] toArray() {
-    return asList().toArray();
-  }
-
-  @Override
-  default <T> T[] toArray(T[] array) {
-    return asList().toArray(array);
-  }
-
-  @Override
-  default boolean add(ITEM_TYPE item) {
-    throw new UnsupportedOperationException("object is immutable");
-  }
-
-  @Override
-  default void add(int index, ITEM_TYPE element) {
-    throw new UnsupportedOperationException("object is immutable");
-  }
-
-  @Override
-  default boolean addAll(Collection<? extends ITEM_TYPE> collection) {
-    throw new UnsupportedOperationException("object is immutable");
+  /**
+   * Returns an unmodifiable sequence containing the provided {@code items}.
+   *
+   * @param <ITEM_TYPE>
+   *          the type of items contained in the sequence.
+   * @param items
+   *          the items to add to the sequence
+   * @return the new sequence
+   */
+  @NonNull
+  static <ITEM_TYPE extends IItem> ISequence<ITEM_TYPE> ofCollection( // NOPMD - intentional
+      @NonNull List<ITEM_TYPE> items) {
+    ISequence<ITEM_TYPE> retval;
+    if (items.isEmpty()) {
+      retval = empty();
+    } else if (items.size() == 1) {
+      retval = new SingletonSequence<>(ObjectUtils.notNull(items.iterator().next()));
+    } else {
+      retval = new SequenceN<>(items);
+    }
+    return retval;
   }
 
-  @Override
-  default boolean addAll(int index, Collection<? extends ITEM_TYPE> collection) {
-    throw new UnsupportedOperationException("object is immutable");
+  /**
+   * Returns an unmodifiable sequence containing the provided {@code item}.
+   * <p>
+   * If the item is {@code null} and empty sequence will be created.
+   *
+   * @param <T>
+   *          the type of items contained in the sequence.
+   * @param item
+   *          the item to add to the sequence
+   * @return the new sequence
+   */
+  @NonNull
+  static <T extends IItem> ISequence<T> of( // NOPMD - intentional
+      @Nullable T item) {
+    return item == null ? empty() : new SingletonSequence<>(item);
   }
 
-  @Override
-  default boolean remove(Object obj) {
-    throw new UnsupportedOperationException("object is immutable");
+  /**
+   * Returns an unmodifiable sequence containing the provided {@code items}.
+   *
+   * @param <T>
+   *          the type of items contained in the sequence.
+   * @param items
+   *          the items to add to the sequence
+   * @return the new sequence
+   */
+  // TODO: remove null check on callers
+  @NonNull
+  static <T extends IItem> ISequence<T> of(@NonNull Stream<T> items) {
+    return new StreamSequence<>(items);
   }
 
-  @Override
-  default ITEM_TYPE remove(int index) {
-    throw new UnsupportedOperationException("object is immutable");
+  /**
+   * Returns an unmodifiable sequence containing zero elements.
+   *
+   * @param <T>
+   *          the item type
+   * @return an empty {@code ISequence}
+   */
+  @NonNull
+  static <T extends IItem> ISequence<T> of() {
+    return empty();
   }
 
-  @Override
-  default boolean containsAll(Collection<?> collection) {
-    return asList().containsAll(collection);
+  /**
+   * Returns an unmodifiable sequence containing two items.
+   *
+   * @param <T>
+   *          the {@code ISequence}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @return an {@code ISequence} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends IItem> ISequence<T> of(T e1, T e2) {
+    return new SequenceN<>(e1, e2);
   }
 
-  @Override
-  default boolean removeAll(Collection<?> collection) {
-    throw new UnsupportedOperationException("object is immutable");
+  /**
+   * Returns an unmodifiable sequence containing three elements.
+   *
+   * @param <T>
+   *          the {@code ISequence}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @return an {@code ISequence} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends IItem> ISequence<T> of(T e1, T e2, T e3) {
+    return new SequenceN<>(e1, e2, e3);
   }
 
-  @Override
-  default boolean retainAll(Collection<?> collection) {
-    throw new UnsupportedOperationException("object is immutable");
+  /**
+   * Returns an unmodifiable sequence containing four items.
+   *
+   * @param <T>
+   *          the {@code ISequence}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @return an {@code ISequence} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends IItem> ISequence<T> of(T e1, T e2, T e3, T e4) {
+    return new SequenceN<>(e1, e2, e3, e4);
   }
 
-  @Override
-  default void clear() {
-    throw new UnsupportedOperationException("object is immutable");
+  /**
+   * Returns an unmodifiable sequence containing five items.
+   *
+   * @param <T>
+   *          the {@code ISequence}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @return an {@code ISequence} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends IItem> ISequence<T> of(T e1, T e2, T e3, T e4, T e5) {
+    return new SequenceN<>(e1, e2, e3, e4, e5);
   }
 
-  @Override
-  default ITEM_TYPE get(int index) {
-    return asList().get(index);
+  /**
+   * Returns an unmodifiable sequence containing six items.
+   *
+   * @param <T>
+   *          the {@code ISequence}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @param e6
+   *          the sixth item
+   * @return an {@code ISequence} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends IItem> ISequence<T> of(T e1, T e2, T e3, T e4, T e5, T e6) {
+    return new SequenceN<>(e1, e2, e3, e4, e5, e6);
   }
 
-  @Override
-  default ITEM_TYPE set(int index, ITEM_TYPE element) {
-    throw new UnsupportedOperationException("object is immutable");
+  /**
+   * Returns an unmodifiable sequence containing seven items.
+   *
+   * @param <T>
+   *          the {@code ISequence}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @param e6
+   *          the sixth item
+   * @param e7
+   *          the seventh item
+   * @return an {@code ISequence} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends IItem> ISequence<T> of(T e1, T e2, T e3, T e4, T e5, T e6, T e7) {
+    return new SequenceN<>(e1, e2, e3, e4, e5, e6, e7);
   }
 
-  @Override
-  default int indexOf(Object obj) {
-    return asList().indexOf(obj);
+  /**
+   * Returns an unmodifiable sequence containing eight items.
+   *
+   * @param <T>
+   *          the {@code ISequence}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @param e6
+   *          the sixth item
+   * @param e7
+   *          the seventh item
+   * @param e8
+   *          the eighth item
+   * @return an {@code ISequence} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends IItem> ISequence<T> of(T e1, T e2, T e3, T e4, T e5, T e6, T e7, T e8) {
+    return new SequenceN<>(e1, e2, e3, e4, e5, e6, e7, e8);
   }
 
-  @Override
-  default int lastIndexOf(Object obj) {
-    return asList().lastIndexOf(obj);
+  /**
+   * Returns an unmodifiable sequence containing nine items.
+   *
+   * @param <T>
+   *          the {@code ISequence}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @param e6
+   *          the sixth item
+   * @param e7
+   *          the seventh item
+   * @param e8
+   *          the eighth item
+   * @param e9
+   *          the ninth item
+   * @return an {@code ISequence} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends IItem> ISequence<T> of(T e1, T e2, T e3, T e4, T e5, T e6, T e7, T e8, T e9) {
+    return new SequenceN<>(e1, e2, e3, e4, e5, e6, e7, e8, e9);
   }
 
-  @Override
-  default ListIterator<ITEM_TYPE> listIterator() {
-    return asList().listIterator();
+  /**
+   * Returns an unmodifiable sequence containing ten items.
+   *
+   * @param <T>
+   *          the {@code ISequence}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @param e6
+   *          the sixth item
+   * @param e7
+   *          the seventh item
+   * @param e8
+   *          the eighth item
+   * @param e9
+   *          the ninth item
+   * @param e10
+   *          the tenth item
+   * @return an {@code IArrayItem} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends IItem> ISequence<T> of(T e1, T e2, T e3, T e4, T e5, T e6, T e7, T e8, T e9, T e10) {
+    return new SequenceN<>(e1, e2, e3, e4, e5, e6, e7, e8, e9, e10);
   }
 
-  @Override
-  default ListIterator<ITEM_TYPE> listIterator(int index) {
-    return asList().listIterator(index);
+  /**
+   * Returns an unmodifiable sequence containing an arbitrary number of items.
+   *
+   * @param <T>
+   *          the {@code ISequence}'s item type
+   * @param items
+   *          the items to be contained in the list
+   * @return an {@code ISequence} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null} or if the array is {@code null}
+   */
+  @SafeVarargs
+  @NonNull
+  static <T extends IItem> ISequence<T> of(@NonNull T... items) {
+    return items.length == 0 ? empty() : new SequenceN<>(items);
   }
 
-  @Override
-  default List<ITEM_TYPE> subList(int fromIndex, int toIndex) {
-    return asList().subList(fromIndex, toIndex);
+  /**
+   * Returns an unmodifiable sequence containing the items of the given
+   * Collection, in its iteration order. The given Collection must not be null,
+   * and it must not contain any null items. If the given Collection is
+   * subsequently modified, the returned array item will not reflect such
+   * modifications.
+   *
+   * @param <T>
+   *          the {@code ISequence}'s item type
+   * @param collection
+   *          a {@code Collection} from which items are drawn, must be non-null
+   * @return an {@code ISequence} containing the items of the given
+   *         {@code Collection}
+   * @throws NullPointerException
+   *           if collection is null, or if it contains any nulls
+   * @since 10
+   */
+  @SuppressWarnings("unchecked")
+  @NonNull
+  static <T extends IItem> ISequence<T> copyOf(Collection<? extends T> collection) {
+    return collection instanceof IArrayItem
+        ? (ISequence<T>) collection
+        : collection.isEmpty()
+            ? empty()
+            : new SequenceN<>(new ArrayList<>(collection));
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/InvalidTypeMetapathException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/InvalidTypeMetapathException.java
index f7ace0bbf..b08d9f5a3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/InvalidTypeMetapathException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/InvalidTypeMetapathException.java
@@ -56,7 +56,7 @@ public class InvalidTypeMetapathException
    *          the original exception cause
    */
   public InvalidTypeMetapathException(@NonNull IItem item, @NonNull Throwable cause) {
-    super(TypeMetapathException.INVALID_TYPE_ERROR, String.format("Invalid data type '%s'", item.getClass().getName()),
+    super(INVALID_TYPE_ERROR, String.format("Invalid data type '%s'", item.getClass().getName()),
         cause);
     this.item = item;
   }
@@ -69,7 +69,7 @@ public InvalidTypeMetapathException(@NonNull IItem item, @NonNull Throwable caus
    *          the item related to the invalid type error
    */
   public InvalidTypeMetapathException(@NonNull IItem item) {
-    super(TypeMetapathException.INVALID_TYPE_ERROR, String.format("Invalid data type '%s'", item.getClass().getName()));
+    super(INVALID_TYPE_ERROR, String.format("Invalid data type '%s'", item.getClass().getName()));
     this.item = item;
   }
 
@@ -85,7 +85,7 @@ public InvalidTypeMetapathException(@NonNull IItem item) {
    *          the original exception cause
    */
   public InvalidTypeMetapathException(@Nullable IItem item, @Nullable String message, @NonNull Throwable cause) {
-    super(TypeMetapathException.INVALID_TYPE_ERROR, message, cause);
+    super(INVALID_TYPE_ERROR, message, cause);
     this.item = item;
   }
 
@@ -99,7 +99,7 @@ public InvalidTypeMetapathException(@Nullable IItem item, @Nullable String messa
    *          the exception message
    */
   public InvalidTypeMetapathException(@Nullable IItem item, @Nullable String message) {
-    super(TypeMetapathException.INVALID_TYPE_ERROR, message);
+    super(INVALID_TYPE_ERROR, message);
     this.item = item;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathConstants.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathConstants.java
index 86b73dd12..1ddc29efb 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathConstants.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathConstants.java
@@ -50,21 +50,30 @@ public final class MetapathConstants {
       URI.create("http://csrc.nist.gov/ns/metaschema/metapath-functions"));
   @NonNull
   public static final URI NS_METAPATH_FUNCTIONS_MATH = ObjectUtils.requireNonNull(
-      URI.create("http://csrc.nist.gov/ns/metaschema/metapath-functions/math"));
+      URI.create(NS_METAPATH_FUNCTIONS + "/math"));
   @NonNull
-  public static final URI NS_METAPATH_FUNCTIONS_EXTENDED = NS_METAPATH;
+  public static final URI NS_METAPATH_FUNCTIONS_ARRAY = ObjectUtils.requireNonNull(
+      URI.create(NS_METAPATH_FUNCTIONS + "/array"));
+  @NonNull
+  public static final URI NS_METAPATH_FUNCTIONS_MAP = ObjectUtils.requireNonNull(
+      URI.create(NS_METAPATH_FUNCTIONS + "/map"));
+  @NonNull
+  public static final URI NS_METAPATH_FUNCTIONS_EXTENDED = NS_METAPATH_FUNCTIONS;
 
   @NonNull
-  public static final String PREFIX_METAPATH = "mp";
+  public static final String PREFIX_METAPATH = "meta";
   @NonNull
   public static final String PREFIX_XML_SCHEMA = "xs";
   @NonNull
   public static final String PREFIX_XPATH_FUNCTIONS = "mp";
   @NonNull
   public static final String PREFIX_XPATH_FUNCTIONS_MATH = "math";
+  @NonNull
+  public static final String PREFIX_XPATH_FUNCTIONS_ARRAY = "array";
+  @NonNull
+  public static final String PREFIX_XPATH_FUNCTIONS_MAP = "map";
 
   private MetapathConstants() {
     // disable construction
   }
-
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathExpression.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathExpression.java
index 15d1674aa..61a74e031 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathExpression.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/MetapathExpression.java
@@ -32,8 +32,8 @@
 import gov.nist.secauto.metaschema.core.metapath.antlr.ParseTreePrinter;
 import gov.nist.secauto.metaschema.core.metapath.cst.BuildCSTVisitor;
 import gov.nist.secauto.metaschema.core.metapath.cst.CSTPrinter;
-import gov.nist.secauto.metaschema.core.metapath.cst.ContextItem;
 import gov.nist.secauto.metaschema.core.metapath.cst.IExpression;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.ContextItem;
 import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
 import gov.nist.secauto.metaschema.core.metapath.function.library.FnBoolean;
 import gov.nist.secauto.metaschema.core.metapath.function.library.FnData;
@@ -46,6 +46,8 @@
 
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.DefaultErrorStrategy;
+import org.antlr.v4.runtime.Parser;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.apache.logging.log4j.LogManager;
@@ -88,17 +90,25 @@ public enum ResultType {
     /**
      * The result is expected to be an {@link INodeItem} value.
      */
-    NODE;
+    // TODO: audit use of this value, replace with ITEM where appropriate
+    NODE,
+    /**
+     * The result is expected to be an {@link IItem} value.
+     */
+    ITEM;
   }
 
   private static final Logger LOGGER = LogManager.getLogger(MetapathExpression.class);
 
   @NonNull
-  public static final MetapathExpression CONTEXT_NODE = new MetapathExpression(".", ContextItem.instance());
+  public static final MetapathExpression CONTEXT_NODE
+      = new MetapathExpression(".", ContextItem.instance(), StaticContext.instance());
 
   private final String path;
   @NonNull
-  private final IExpression node;
+  private final IExpression expression;
+  @NonNull
+  private final StaticContext staticContext;
 
   /**
    * Compiles a Metapath expression string.
@@ -111,6 +121,24 @@ public enum ResultType {
    */
   @NonNull
   public static MetapathExpression compile(@NonNull String path) {
+    StaticContext context = StaticContext.builder().build();
+
+    return compile(path, context);
+  }
+
+  /**
+   * Compiles a Metapath expression string using the provided static context.
+   *
+   * @param path
+   *          the metapath expression
+   * @param context
+   *          the static evaluation context
+   * @return the compiled expression object
+   * @throws MetapathException
+   *           if an error occurred while compiling the Metapath expression
+   */
+  @NonNull
+  public static MetapathExpression compile(@NonNull String path, @NonNull StaticContext context) {
     @NonNull MetapathExpression retval;
     if (".".equals(path)) {
       retval = CONTEXT_NODE;
@@ -124,6 +152,13 @@ public static MetapathExpression compile(@NonNull String path) {
         Metapath10 parser = new Metapath10(tokens);
         parser.removeErrorListeners();
         parser.addErrorListener(new FailingErrorListener());
+        parser.setErrorHandler(new DefaultErrorStrategy() {
+
+          @Override
+          public void sync(Parser recognizer) {
+            // disable
+          }
+        });
 
         ParseTree tree = ObjectUtils.notNull(parser.expr());
 
@@ -140,12 +175,12 @@ public static MetapathExpression compile(@NonNull String path) {
           }
         }
 
-        IExpression expr = new BuildCSTVisitor().visit(tree);
+        IExpression expr = new BuildCSTVisitor(context).visit(tree);
 
         if (LOGGER.isDebugEnabled()) {
           LOGGER.atDebug().log(String.format("Metapath CST:%n%s", CSTPrinter.toString(expr)));
         }
-        retval = new MetapathExpression(path, expr);
+        retval = new MetapathExpression(path, expr, context);
       } catch (MetapathException | ParseCancellationException ex) {
         String msg = String.format("Unable to compile Metapath '%s'", path);
         LOGGER.atError().withThrowable(ex).log(msg);
@@ -162,10 +197,13 @@ public static MetapathExpression compile(@NonNull String path) {
    *          the Metapath as a string
    * @param expr
    *          the Metapath as a compiled abstract syntax tree (AST)
+   * @param staticContext
+   *          the static evaluation context
    */
-  protected MetapathExpression(@NonNull String path, @NonNull IExpression expr) {
+  protected MetapathExpression(@NonNull String path, @NonNull IExpression expr, @NonNull StaticContext staticContext) {
     this.path = path;
-    this.node = expr;
+    this.expression = expr;
+    this.staticContext = staticContext;
   }
 
   /**
@@ -184,7 +222,27 @@ public String getPath() {
    */
   @NonNull
   protected IExpression getASTNode() {
-    return node;
+    return expression;
+  }
+
+  /**
+   * Get the static context used to compile this Metapath.
+   *
+   * @return the static context
+   */
+  @NonNull
+  protected StaticContext getStaticContext() {
+    return staticContext;
+  }
+
+  /**
+   * Generate a new dynamic context.
+   *
+   * @return the generated dynamic context
+   */
+  @NonNull
+  public DynamicContext dynamicContext() {
+    return new DynamicContext(getStaticContext());
   }
 
   @Override
@@ -298,7 +356,7 @@ public <T> T evaluateAs(
    *           if the provided sequence is incompatible with the requested result
    *           type
    */
-  @SuppressWarnings("PMD.NullAssignment") // for readability
+  @SuppressWarnings({ "PMD.NullAssignment", "PMD.CyclomaticComplexity" }) // for readability
   @Nullable
   protected <T> T toResultType(@NonNull ISequence<?> sequence, @NonNull ResultType resultType) {
     Object result;
@@ -306,8 +364,9 @@ protected <T> T toResultType(@NonNull ISequence<?> sequence, @NonNull ResultType
     case BOOLEAN:
       result = FnBoolean.fnBoolean(sequence).toBoolean();
       break;
+    case ITEM:
     case NODE:
-      result = FunctionUtils.getFirstItem(sequence, true);
+      result = sequence.getFirstItem(true);
       break;
     case NUMBER:
       INumericItem numeric = FunctionUtils.toNumeric(sequence, true);
@@ -317,8 +376,8 @@ protected <T> T toResultType(@NonNull ISequence<?> sequence, @NonNull ResultType
       result = sequence;
       break;
     case STRING:
-      IItem item = FunctionUtils.getFirstItem(sequence, true);
-      result = item == null ? "" : FnData.fnDataItem(item).asString();
+      IAnyAtomicItem item = FnData.fnData(sequence).getFirstItem(true);
+      result = item == null ? "" : item.asString();
       break;
     default:
       throw new InvalidTypeMetapathException(null, String.format("unsupported result type '%s'", resultType.name()));
@@ -360,10 +419,7 @@ public <T extends IItem> ISequence<T> evaluate() {
   @NonNull
   public <T extends IItem> ISequence<T> evaluate(
       @Nullable IItem focus) {
-    return (ISequence<T>) evaluate(
-        focus,
-        StaticContext.builder()
-            .build().dynamicContext());
+    return (ISequence<T>) evaluate(focus, dynamicContext());
   }
 
   /**
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticContext.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticContext.java
index c30b41349..252d567c3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticContext.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticContext.java
@@ -26,11 +26,16 @@
 
 package gov.nist.secauto.metaschema.core.metapath;
 
+import gov.nist.secauto.metaschema.core.metapath.EQNameUtils.IEQNamePrefixResolver;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import javax.xml.XMLConstants;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -44,6 +49,8 @@
 public final class StaticContext {
   @NonNull
   private static final Map<String, URI> WELL_KNOWN_NAMESPACES;
+  @NonNull
+  private static final Map<String, String> WELL_KNOWN_URI_TO_PREFIX;
 
   static {
     Map<String, URI> knownNamespaces = new ConcurrentHashMap<>();
@@ -59,13 +66,29 @@ public final class StaticContext {
     knownNamespaces.put(
         MetapathConstants.PREFIX_XPATH_FUNCTIONS_MATH,
         MetapathConstants.NS_METAPATH_FUNCTIONS_MATH);
+    knownNamespaces.put(
+        MetapathConstants.PREFIX_XPATH_FUNCTIONS_ARRAY,
+        MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY);
+    knownNamespaces.put(
+        MetapathConstants.PREFIX_XPATH_FUNCTIONS_MAP,
+        MetapathConstants.NS_METAPATH_FUNCTIONS_MAP);
     WELL_KNOWN_NAMESPACES = CollectionUtil.unmodifiableMap(knownNamespaces);
+
+    WELL_KNOWN_URI_TO_PREFIX = ObjectUtils.notNull(WELL_KNOWN_NAMESPACES.entrySet().stream()
+        .collect(Collectors.toUnmodifiableMap(
+            entry -> entry.getValue().toASCIIString(),
+            Map.Entry::getKey,
+            (v1, v2) -> v2)));
   }
 
   @Nullable
   private final URI baseUri;
   @NonNull
   private final Map<String, URI> knownNamespaces;
+  @Nullable
+  private final URI defaultModelNamespace;
+  @Nullable
+  private final URI defaultFunctionNamespace;
 
   /**
    * Get the mapping of prefix to namespace URI for all well-known namespaces
@@ -77,36 +100,49 @@ public final class StaticContext {
    * @return the mapping of prefix to namespace URI for all well-known namespaces
    */
   @SuppressFBWarnings("MS_EXPOSE_REP")
-  public static Map<String, URI> getWellKnownNamespaces() {
+  public static Map<String, URI> getWellKnownNamespacesMap() {
     return WELL_KNOWN_NAMESPACES;
   }
 
   /**
-   * Create a new static context instance using default values.
+   * Get the mapping of namespace URIs to prefixes for all well-known namespaces
+   * provided by default to the static context.
    *
-   * @return a new static context instance
+   * @return the mapping of namespace URI to prefix for all well-known namespaces
    */
-  @NonNull
-  public static StaticContext instance() {
-    return builder().build();
+  @SuppressFBWarnings("MS_EXPOSE_REP")
+  public static Map<String, String> getWellKnownURIToPrefixMap() {
+    return WELL_KNOWN_URI_TO_PREFIX;
   }
 
   /**
-   * Create a new static context builder that allows for fine-grained adjustments
-   * when creating a new static context.
+   * Get the namespace prefix associated with the provided URI, if the URI is
+   * well-known.
    *
-   * @return a new builder
+   * @param uri
+   *          the URI to get the prefix for
+   * @return the prefix or {@code null} if the provided URI is not well-known
+   */
+  @Nullable
+  public static String getWellKnownPrefixForUri(@NonNull String uri) {
+    return WELL_KNOWN_URI_TO_PREFIX.get(uri);
+  }
+
+  /**
+   * Create a new static context instance using default values.
+   *
+   * @return a new static context instance
    */
   @NonNull
-  public static Builder builder() {
-    return new Builder();
+  public static StaticContext instance() {
+    return builder().build();
   }
 
-  private StaticContext(
-      @Nullable URI baseUri,
-      @NonNull Map<String, URI> knownNamespaces) {
-    this.baseUri = baseUri;
-    this.knownNamespaces = knownNamespaces;
+  private StaticContext(Builder builder) {
+    this.baseUri = builder.baseUri;
+    this.knownNamespaces = CollectionUtil.unmodifiableMap(ObjectUtils.notNull(Map.copyOf(builder.namespaces)));
+    this.defaultModelNamespace = builder.defaultModelNamespace;
+    this.defaultFunctionNamespace = builder.defaultFunctionNamespace;
   }
 
   /**
@@ -132,14 +168,14 @@ public URI getBaseUri() {
    * namespace bindings when a prefix match is not found.
    * <p>
    * The well-known namespace bindings can be retrieved using the
-   * {@link StaticContext#getWellKnownNamespaces()} method.
+   * {@link StaticContext#getWellKnownNamespacesMap()} method.
    *
    * @param prefix
    *          the namespace prefix
    * @return the namespace URI bound to the prefix, or {@code null} if no
    *         namespace is bound to the prefix
    * @see Builder#namespace(String, URI)
-   * @see #getWellKnownNamespaces()
+   * @see #getWellKnownNamespacesMap()
    */
   @Nullable
   public URI lookupNamespaceURIForPrefix(@NonNull String prefix) {
@@ -167,22 +203,182 @@ public String lookupNamespaceForPrefix(@NonNull String prefix) {
   }
 
   /**
-   * Generate a new dynamic context.
+   * Get the default namespace for assembly, field, or flag references that have
+   * no namespace prefix.
+   *
+   * @return the namespace if defined or {@code null} otherwise
+   */
+  @Nullable
+  public URI getDefaultModelNamespace() {
+    return defaultModelNamespace;
+  }
+
+  /**
+   * Get the default namespace for function references that have no namespace
+   * prefix.
+   *
+   * @return the namespace if defined or {@code null} otherwise
+   */
+  @Nullable
+  public URI getDefaultFunctionNamespace() {
+    return defaultFunctionNamespace;
+  }
+
+  /**
+   * Get a prefix resolver for use with Metapath function names that will attempt
+   * to identify the namespace corresponding to a given prefix.
+   * <p>
+   * This will use the following lookup order, advancing to the next when a
+   * {@code null} value is returned:
+   * <ol>
+   * <li>Lookup the prefix using
+   * {@link StaticContext#lookupNamespaceForPrefix(String)}</li>
+   * <li>Return the result of
+   * {@link StaticContext#getDefaultFunctionNamespace()}</li>
+   * <li>Return {@link XMLConstants#NULL_NS_URI}</li>
+   * </ol>
+   *
+   * @return the resolver
+   */
+  @NonNull
+  public IEQNamePrefixResolver getFunctionPrefixResolver() {
+    return this::resolveFunctionPrefix;
+  }
+
+  @NonNull
+  private String resolveFunctionPrefix(@NonNull String prefix) {
+    String ns = lookupNamespaceForPrefix(prefix);
+    if (ns == null) {
+      URI uri = getDefaultFunctionNamespace();
+      if (uri != null) {
+        ns = uri.toASCIIString();
+      }
+    }
+    return ns == null ? XMLConstants.NULL_NS_URI : ns;
+  }
+
+  /**
+   * Get a prefix resolver for use with Metapath flag node names that will attempt
+   * to identify the namespace corresponding to a given prefix.
+   * <p>
+   * This will use the following lookup order, advancing to the next when a
+   * {@code null} value is returned:
+   * <ol>
+   * <li>Lookup the prefix using
+   * {@link StaticContext#lookupNamespaceForPrefix(String)}</li>
+   * <li>Return {@link XMLConstants#NULL_NS_URI}</li>
+   * </ol>
+   *
+   * @return the resolver
+   */
+  @NonNull
+  public IEQNamePrefixResolver getFlagPrefixResolver() {
+    return this::resolveFlagReferencePrefix;
+  }
+
+  @NonNull
+  private String resolveFlagReferencePrefix(@NonNull String prefix) {
+    String ns = lookupNamespaceForPrefix(prefix);
+    return ns == null ? XMLConstants.NULL_NS_URI : ns;
+  }
+
+  /**
+   * Get a prefix resolver for use with Metapath model node names that will
+   * attempt to identify the namespace corresponding to a given prefix.
+   * <p>
+   * This will use the following lookup order, advancing to the next when a
+   * {@code null} value is returned:
+   * <ol>
+   * <li>Lookup the prefix using
+   * {@link StaticContext#lookupNamespaceForPrefix(String)}</li>
+   * <li>Return the result of
+   * {@link StaticContext#getDefaultModelNamespace()}</li>
+   * <li>Return {@link XMLConstants#NULL_NS_URI}</li>
+   * </ol>
+   *
+   * @return the resolver
+   */
+  @NonNull
+  public IEQNamePrefixResolver getModelPrefixResolver() {
+    return this::resolveModelReferencePrefix;
+  }
+
+  @NonNull
+  private String resolveModelReferencePrefix(@NonNull String prefix) {
+    String ns = lookupNamespaceForPrefix(prefix);
+    if (ns == null) {
+      URI uri = getDefaultModelNamespace();
+      if (uri != null) {
+        ns = uri.toASCIIString();
+      }
+    }
+    return ns == null ? XMLConstants.NULL_NS_URI : ns;
+  }
+
+  /**
+   * Get a prefix resolver for use with Metapath variable names that will attempt
+   * to identify the namespace corresponding to a given prefix.
+   * <p>
+   * This will use the following lookup order, advancing to the next when a
+   * {@code null} value is returned:
+   * <ol>
+   * <li>Lookup the prefix using
+   * {@link StaticContext#lookupNamespaceForPrefix(String)}</li>
+   * <li>Return {@link XMLConstants#NULL_NS_URI}</li>
+   * </ol>
    *
-   * @return the generated dynamic context
+   * @return the resolver
    */
   @NonNull
-  public DynamicContext dynamicContext() {
-    return new DynamicContext(this);
+  public IEQNamePrefixResolver getVariablePrefixResolver() {
+    return this::resolveVariablePrefix;
+  }
+
+  @NonNull
+  private String resolveVariablePrefix(@NonNull String prefix) {
+    String ns = lookupNamespaceForPrefix(prefix);
+    return ns == null ? XMLConstants.NULL_NS_URI : ns;
+  }
+
+  /**
+   * Get a new static context builder that is pre-populated with the setting of
+   * this static context.
+   *
+   * @return a new builder
+   */
+  @NonNull
+  public Builder buildFrom() {
+    Builder builder = builder();
+    builder.baseUri = this.baseUri;
+    builder.namespaces.putAll(this.knownNamespaces);
+    builder.defaultModelNamespace = this.defaultModelNamespace;
+    builder.defaultFunctionNamespace = this.defaultFunctionNamespace;
+    return builder;
+  }
+
+  /**
+   * Create a new static context builder that allows for fine-grained adjustments
+   * when creating a new static context.
+   *
+   * @return a new builder
+   */
+  @NonNull
+  public static Builder builder() {
+    return new Builder();
   }
 
   /**
    * A builder used to generate the static context.
    */
   public static final class Builder {
+    @Nullable
     private URI baseUri;
     @NonNull
     private final Map<String, URI> namespaces = new ConcurrentHashMap<>();
+    @Nullable
+    private URI defaultModelNamespace;
+    @Nullable
+    private URI defaultFunctionNamespace = MetapathConstants.NS_METAPATH_FUNCTIONS;
 
     private Builder() {
       namespaces.put(
@@ -223,7 +419,7 @@ public Builder baseUri(@NonNull URI uri) {
      * {@link StaticContext#lookupNamespaceForPrefix(String)} method.
      * <p>
      * Well-known namespace bindings are used by default, which can be retrieved
-     * using the {@link StaticContext#getWellKnownNamespaces()} method.
+     * using the {@link StaticContext#getWellKnownNamespacesMap()} method.
      *
      * @param prefix
      *          the prefix to associate with the namespace, which may be
@@ -232,7 +428,7 @@ public Builder baseUri(@NonNull URI uri) {
      * @return this builder
      * @see StaticContext#lookupNamespaceForPrefix(String)
      * @see StaticContext#lookupNamespaceURIForPrefix(String)
-     * @see StaticContext#getWellKnownNamespaces()
+     * @see StaticContext#getWellKnownNamespacesMap()
      */
     @NonNull
     public Builder namespace(@NonNull String prefix, @NonNull URI uri) {
@@ -240,6 +436,85 @@ public Builder namespace(@NonNull String prefix, @NonNull URI uri) {
       return this;
     }
 
+    /**
+     * A convenience method for {@link #namespace(String, URI)}.
+     *
+     * @param prefix
+     *          the prefix to associate with the namespace, which may be
+     * @param uri
+     *          the namespace URI
+     * @return this builder
+     * @throws IllegalArgumentException
+     *           if the provided URI is invalid
+     * @see StaticContext#lookupNamespaceForPrefix(String)
+     * @see StaticContext#lookupNamespaceURIForPrefix(String)
+     * @see StaticContext#getWellKnownNamespacesMap()
+     */
+    @NonNull
+    public Builder namespace(@NonNull String prefix, @NonNull String uri) {
+      return namespace(prefix, ObjectUtils.notNull(URI.create(uri)));
+    }
+
+    /**
+     * Defines the default namespace to use for assembly, field, or flag references
+     * that have no namespace prefix.
+     *
+     * @param uri
+     *          the namespace URI
+     * @return this builder
+     * @see StaticContext#getDefaultModelNamespace()
+     */
+    @NonNull
+    public Builder defaultModelNamespace(@NonNull URI uri) {
+      this.defaultModelNamespace = uri;
+      return this;
+    }
+
+    /**
+     * A convenience method for {@link #defaultModelNamespace(URI)}.
+     *
+     * @param uri
+     *          the namespace URI
+     * @return this builder
+     * @throws IllegalArgumentException
+     *           if the provided URI is invalid
+     * @see StaticContext#getDefaultModelNamespace()
+     */
+    @NonNull
+    public Builder defaultModelNamespace(@NonNull String uri) {
+      return defaultModelNamespace(ObjectUtils.notNull(URI.create(uri)));
+    }
+
+    /**
+     * Defines the default namespace to use for assembly, field, or flag references
+     * that have no namespace prefix.
+     *
+     * @param uri
+     *          the namespace URI
+     * @return this builder
+     * @see StaticContext#getDefaultFunctionNamespace()
+     */
+    @NonNull
+    public Builder defaultFunctionNamespace(@NonNull URI uri) {
+      this.defaultFunctionNamespace = uri;
+      return this;
+    }
+
+    /**
+     * A convenience method for {@link #defaultFunctionNamespace(URI)}.
+     *
+     * @param uri
+     *          the namespace URI
+     * @return this builder
+     * @throws IllegalArgumentException
+     *           if the provided URI is invalid
+     * @see StaticContext#getDefaultFunctionNamespace()
+     */
+    @NonNull
+    public Builder defaultFunctionNamespace(@NonNull String uri) {
+      return defaultFunctionNamespace(ObjectUtils.notNull(URI.create(uri)));
+    }
+
     /**
      * Construct a new static context using the information provided to the builder.
      *
@@ -247,9 +522,7 @@ public Builder namespace(@NonNull String prefix, @NonNull URI uri) {
      */
     @NonNull
     public StaticContext build() {
-      return new StaticContext(
-          baseUri,
-          CollectionUtil.unmodifiableMap(namespaces));
+      return new StaticContext(this);
     }
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticMetapathException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticMetapathException.java
index eea69c7a7..0331a3cff 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticMetapathException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StaticMetapathException.java
@@ -129,7 +129,7 @@ public StaticMetapathException(int code, Throwable cause) {
   }
 
   @Override
-  protected String getCodePrefix() {
+  public String getCodePrefix() {
     return "MPST";
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/TypeMetapathException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/TypeMetapathException.java
index 89de22791..9066b5976 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/TypeMetapathException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/TypeMetapathException.java
@@ -106,7 +106,7 @@ public TypeMetapathException(int code, Throwable cause) {
   }
 
   @Override
-  protected String getCodePrefix() {
+  public String getCodePrefix() {
     return "MPTY";
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/AbstractAstVisitor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/AbstractAstVisitor.java
index 3b3d16983..1cd5daa56 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/AbstractAstVisitor.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/antlr/AbstractAstVisitor.java
@@ -32,11 +32,14 @@
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.AndexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ArgumentContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ArgumentlistContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ArrayconstructorContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ArrowexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ArrowfunctionspecifierContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.AxisstepContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ComparisonexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ContextitemexprContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.CurlyarrayconstructorContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.EnclosedexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.EqnameContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ExprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ExprsingleContext;
@@ -47,8 +50,14 @@
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.GeneralcompContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.IfexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.IntersectexceptexprContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.KeyspecifierContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.LetexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.LiteralContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.LookupContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.MapconstructorContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.MapconstructorentryContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.MapkeyexprContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.MapvalueexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.MetapathContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.MultiplicativeexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.NametestContext;
@@ -71,9 +80,11 @@
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.SimpleletbindingContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.SimpleletclauseContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.SimplemapexprContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.SquarearrayconstructorContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.StepexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.StringconcatexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.UnaryexprContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.UnarylookupContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.UnionexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ValuecompContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ValueexprContext;
@@ -138,10 +149,9 @@ protected <T extends RuleContext> R delegateToChild(@NonNull T ctx) {
     throw new IllegalStateException("a single child expression was expected");
   }
 
-  /* ============================================================
-   * Expressions - https://www.w3.org/TR/xpath-31/#id-expressions
-   * ============================================================
-   */
+  // ============================================================
+  // Expressions - https://www.w3.org/TR/xpath-31/#id-expressions
+  // ============================================================
 
   @Override
   public R visitMetapath(MetapathContext ctx) {
@@ -169,10 +179,10 @@ public R visitExprsingle(ExprsingleContext ctx) {
     assert ctx != null;
     return delegateToChild(ctx);
   }
-  /* ============================================================================
-   * Primary Expressions - https://www.w3.org/TR/xpath-31/#id-primary-expressions
-   * ============================================================================
-   */
+
+  // ============================================================================
+  // Primary Expressions - https://www.w3.org/TR/xpath-31/#id-primary-expressions
+  // ============================================================================
 
   @Override
   public R visitPrimaryexpr(PrimaryexprContext ctx) {
@@ -180,10 +190,9 @@ public R visitPrimaryexpr(PrimaryexprContext ctx) {
     return delegateToChild(ctx);
   }
 
-  /* =================================================================
-   * Literal Expressions - https://www.w3.org/TR/xpath-31/#id-literals
-   * =================================================================
-   */
+  // =================================================================
+  // Literal Expressions - https://www.w3.org/TR/xpath-31/#id-literals
+  // =================================================================
 
   /**
    * Handle the provided expression.
@@ -215,10 +224,9 @@ public R visitNumericliteral(NumericliteralContext ctx) {
     return handle(ctx, (context) -> handleNumericLiteral(ctx));
   }
 
-  /* ==================================================================
-   * Variable References - https://www.w3.org/TR/xpath-31/#id-variables
-   * ==================================================================
-   */
+  // ==================================================================
+  // Variable References - https://www.w3.org/TR/xpath-31/#id-variables
+  // ==================================================================
 
   /**
    * Handle the provided expression.
@@ -241,10 +249,10 @@ public R visitVarname(VarnameContext ctx) {
     return delegateToChild(ctx);
   }
 
-  /* =================================================================================
-   * Parenthesized Expressions  - https://www.w3.org/TR/xpath-31/#id-paren-expressions
-   * =================================================================================
-   */
+  // ====================================================
+  // Parenthesized Expressions -
+  // https://www.w3.org/TR/xpath-31/#id-paren-expressions
+  // ====================================================
 
   /**
    * Handle the provided expression.
@@ -262,10 +270,10 @@ public R visitParenthesizedexpr(ParenthesizedexprContext ctx) {
     return expr == null ? handleEmptyParenthesizedexpr(ctx) : visit(expr);
   }
 
-  /* =====================================================================================
-   * Context Item Expression  - https://www.w3.org/TR/xpath-31/#id-context-item-expression
-   * =====================================================================================
-   */
+  // ==========================================================
+  // Context Item Expression -
+  // https://www.w3.org/TR/xpath-31/#id-context-item-expression
+  // ==========================================================
 
   /**
    * Handle the provided expression.
@@ -282,10 +290,9 @@ public R visitContextitemexpr(ContextitemexprContext ctx) {
     return handle(ctx, (context) -> handleContextitemexpr(ctx));
   }
 
-  /* =========================================================================
-   * Static Function Calls - https://www.w3.org/TR/xpath-31/#id-function-calls
-   * =========================================================================
-   */
+  // =========================================================================
+  // Static Function Calls - https://www.w3.org/TR/xpath-31/#id-function-calls
+  // =========================================================================
 
   /**
    * Handle the provided expression.
@@ -314,10 +321,19 @@ public R visitArgument(ArgumentContext ctx) {
     throw new IllegalStateException();
   }
 
-  /* =========================================================================
-   * Filter Expressions - https://www.w3.org/TR/xpath-31/#id-filter-expression
-   * =========================================================================
-   */
+  // =======================================================================
+  // Enclosed Expressions - https://www.w3.org/TR/xpath-31/#id-enclosed-expr
+  // =======================================================================
+
+  @Override
+  public R visitEnclosedexpr(EnclosedexprContext ctx) {
+    ExprContext expr = ctx.expr();
+    return expr == null ? null : expr.accept(this);
+  }
+
+  // =========================================================================
+  // Filter Expressions - https://www.w3.org/TR/xpath-31/#id-filter-expression
+  // =========================================================================
 
   /**
    * Handle the provided expression.
@@ -334,16 +350,39 @@ public R visitPostfixexpr(PostfixexprContext ctx) {
     return handle(ctx, (context) -> handlePostfixexpr(ctx));
   }
 
+  /**
+   * Handle the provided expression.
+   *
+   * @param ctx
+   *          the provided expression context
+   * @return the result
+   */
+  protected abstract R handlePredicate(@NonNull PredicateContext ctx);
+
   @Override
   public R visitPredicate(PredicateContext ctx) {
-    // should never be called, since this is handled by the parent expression
-    throw new IllegalStateException();
+    assert ctx != null;
+    return handlePredicate(ctx);
   }
 
-  /* ======================================================================
-   * Path Expressions - https://www.w3.org/TR/xpath-31/#id-path-expressions
-   * ======================================================================
+  /**
+   * Handle the provided expression.
+   *
+   * @param ctx
+   *          the provided expression context
+   * @return the result
    */
+  protected abstract R handleLookup(@NonNull LookupContext ctx);
+
+  @Override
+  public R visitLookup(LookupContext ctx) {
+    assert ctx != null;
+    return handleLookup(ctx);
+  }
+
+  // ======================================================================
+  // Path Expressions - https://www.w3.org/TR/xpath-31/#id-path-expressions
+  // ======================================================================
 
   /**
    * Handle the provided expression.
@@ -360,10 +399,10 @@ public R visitPathexpr(PathexprContext ctx) {
     return handle(ctx, (context) -> handlePathexpr(ctx));
   }
 
-  /* =======================================================================================
-   * RelativePath Expressions - https://www.w3.org/TR/xpath-31/#id-relative-path-expressions
-   * =======================================================================================
-   */
+  // ============================================================
+  // RelativePath Expressions -
+  // https://www.w3.org/TR/xpath-31/#id-relative-path-expressions
+  // ============================================================
 
   /**
    * Handle the provided expression.
@@ -380,10 +419,9 @@ public R visitRelativepathexpr(RelativepathexprContext ctx) {
     return handle(ctx, (context) -> handleRelativepathexpr(ctx));
   }
 
-  /* ================================================
-   * Steps - https://www.w3.org/TR/xpath-31/#id-steps
-   * ================================================
-   */
+  // ================================================
+  // Steps - https://www.w3.org/TR/xpath-31/#id-steps
+  // ================================================
 
   @Override
   public R visitStepexpr(StepexprContext ctx) {
@@ -423,10 +461,9 @@ public R visitReversestep(ReversestepContext ctx) {
     return handle(ctx, (context) -> handleReversestep(ctx));
   }
 
-  /* ======================================================================
-   * Predicates within Steps - https://www.w3.org/TR/xpath-31/#id-predicate
-   * ======================================================================
-   */
+  // ======================================================================
+  // Predicates within Steps - https://www.w3.org/TR/xpath-31/#id-predicate
+  // ======================================================================
 
   /**
    * Handle the provided expression.
@@ -449,10 +486,9 @@ public R visitPredicatelist(PredicatelistContext ctx) {
     throw new IllegalStateException();
   }
 
-  /* ===========================================
-   * Axes - https://www.w3.org/TR/xpath-31/#axes
-   * ===========================================
-   */
+  // ===========================================
+  // Axes - https://www.w3.org/TR/xpath-31/#axes
+  // ===========================================
 
   @Override
   public R visitForwardaxis(ForwardaxisContext ctx) {
@@ -466,37 +502,26 @@ public R visitReverseaxis(ReverseaxisContext ctx) {
     throw new IllegalStateException();
   }
 
-  /* =======================================================
-   * Node Tests - https://www.w3.org/TR/xpath-31/#node-tests
-   * =======================================================
-   */
+  // =======================================================
+  // Node Tests - https://www.w3.org/TR/xpath-31/#node-tests
+  // =======================================================
 
   @Override
   public R visitNodetest(NodetestContext ctx) {
-    // TODO: revisit once kindtest is implemented
-    assert ctx != null;
-    return delegateToChild(ctx);
+    // should never be called, since this is handled by the calling context
+    throw new IllegalStateException();
   }
 
   @Override
   public R visitNametest(NametestContext ctx) {
-    assert ctx != null;
-    return delegateToChild(ctx);
+    // should never be called, since this is handled by the calling context
+    throw new IllegalStateException();
   }
 
-  /**
-   * Handle the provided expression.
-   *
-   * @param ctx
-   *          the provided expression context
-   * @return the result
-   */
-  protected abstract R handleEqname(@NonNull EqnameContext ctx);
-
   @Override
   public R visitEqname(EqnameContext ctx) {
-    assert ctx != null;
-    return handleEqname(ctx);
+    // should never be called, since this is handled by the calling context
+    throw new IllegalStateException();
   }
 
   /**
@@ -506,6 +531,7 @@ public R visitEqname(EqnameContext ctx) {
    *          the provided expression context
    * @return the result
    */
+  @NonNull
   protected abstract R handleWildcard(@NonNull WildcardContext ctx);
 
   @Override
@@ -514,10 +540,9 @@ public R visitWildcard(WildcardContext ctx) {
     return handleWildcard(ctx);
   }
 
-  /* ===========================================================
-   * Abbreviated Syntax - https://www.w3.org/TR/xpath-31/#abbrev
-   * ===========================================================
-   */
+  // ===========================================================
+  // Abbreviated Syntax - https://www.w3.org/TR/xpath-31/#abbrev
+  // ===========================================================
 
   /**
    * Handle the provided expression.
@@ -549,10 +574,9 @@ public R visitAbbrevreversestep(AbbrevreversestepContext ctx) {
     return handleAbbrevreversestep(ctx);
   }
 
-  /* ======================================================================
-   * Constructing Sequences - https://www.w3.org/TR/xpath-31/#construct_seq
-   * ======================================================================
-   */
+  // ======================================================================
+  // Constructing Sequences - https://www.w3.org/TR/xpath-31/#construct_seq
+  // ======================================================================
 
   /**
    * Handle the provided expression.
@@ -569,10 +593,9 @@ public R visitRangeexpr(RangeexprContext ctx) {
     return handle(ctx, (context) -> handleRangeexpr(ctx));
   }
 
-  /* ========================================================================
-   * Combining Node Sequences - https://www.w3.org/TR/xpath-31/#combining_seq
-   * ========================================================================
-   */
+  // ========================================================================
+  // Combining Node Sequences - https://www.w3.org/TR/xpath-31/#combining_seq
+  // ========================================================================
 
   /**
    * Handle the provided expression.
@@ -604,10 +627,9 @@ public R visitIntersectexceptexpr(IntersectexceptexprContext ctx) {
     return handle(ctx, (context) -> handleIntersectexceptexpr(ctx));
   }
 
-  /* ======================================================================
-   * Arithmetic Expressions - https://www.w3.org/TR/xpath-31/#id-arithmetic
-   * ======================================================================
-   */
+  // ======================================================================
+  // Arithmetic Expressions - https://www.w3.org/TR/xpath-31/#id-arithmetic
+  // ======================================================================
 
   /**
    * Handle the provided expression.
@@ -660,10 +682,10 @@ public R visitValueexpr(ValueexprContext ctx) {
     return delegateToChild(ctx);
   }
 
-  /* ========================================================================================
-   * String Concatenation Expressions - https://www.w3.org/TR/xpath-31/#id-string-concat-expr
-   * ========================================================================================
-   */
+  // =====================================================
+  // String Concatenation Expressions -
+  // https://www.w3.org/TR/xpath-31/#id-string-concat-expr
+  // =====================================================
 
   /**
    * Handle the provided expression.
@@ -680,10 +702,9 @@ public R visitStringconcatexpr(StringconcatexprContext ctx) {
     return handle(ctx, (context) -> handleStringconcatexpr(ctx));
   }
 
-  /* =======================================================================
-   * Comparison Expressions - https://www.w3.org/TR/xpath-31/#id-comparisons
-   * =======================================================================
-   */
+  // =======================================================================
+  // Comparison Expressions - https://www.w3.org/TR/xpath-31/#id-comparisons
+  // =======================================================================
 
   /**
    * Handle the provided expression.
@@ -712,10 +733,9 @@ public R visitGeneralcomp(GeneralcompContext ctx) {
     throw new IllegalStateException();
   }
 
-  /* ============================================================================
-   * Logical Expressions - https://www.w3.org/TR/xpath-31/#id-logical-expressions
-   * ============================================================================
-   */
+  // ============================================================================
+  // Logical Expressions - https://www.w3.org/TR/xpath-31/#id-logical-expressions
+  // ============================================================================
 
   /**
    * Handle the provided expression.
@@ -747,10 +767,9 @@ public R visitAndexpr(AndexprContext ctx) {
     return handle(ctx, (context) -> handleAndexpr(ctx));
   }
 
-  /* ====================================================================
-   * For Expressions - https://www.w3.org/TR/xpath-31/#id-for-expressions
-   * ====================================================================
-   */
+  // ====================================================================
+  // For Expressions - https://www.w3.org/TR/xpath-31/#id-for-expressions
+  // ====================================================================
 
   /**
    * Handle the provided expression.
@@ -779,10 +798,9 @@ public R visitSimpleforbinding(SimpleforbindingContext ctx) {
     throw new IllegalStateException();
   }
 
-  /* ====================================================================
-   * Let Expressions - https://www.w3.org/TR/xpath-31/#id-let-expressions
-   * ====================================================================
-   */
+  // ====================================================================
+  // Let Expressions - https://www.w3.org/TR/xpath-31/#id-let-expressions
+  // ====================================================================
 
   /**
    * Handle the provided expression.
@@ -811,10 +829,107 @@ public R visitSimpleletbinding(SimpleletbindingContext ctx) {
     throw new IllegalStateException();
   }
 
-  /* =========================================================================
-   * Conditional Expressions - https://www.w3.org/TR/xpath-31/#id-conditionals
-   * =========================================================================
+  // ======================================================================
+  // Map Constructors - https://www.w3.org/TR/xpath-31/#id-map-constructors
+  // ======================================================================
+
+  /**
+   * Handle the provided expression.
+   *
+   * @param ctx
+   *          the provided expression context
+   * @return the result
+   */
+  protected abstract R handleMapConstructor(@NonNull MapconstructorContext ctx);
+
+  @Override
+  public R visitMapconstructor(MapconstructorContext ctx) {
+    assert ctx != null;
+    return handleMapConstructor(ctx);
+  }
+
+  @Override
+  public R visitMapconstructorentry(MapconstructorentryContext ctx) {
+    // should never be called, since this is handled by the parent expression
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public R visitMapkeyexpr(MapkeyexprContext ctx) {
+    assert ctx != null;
+    return delegateToChild(ctx);
+  }
+
+  @Override
+  public R visitMapvalueexpr(MapvalueexprContext ctx) {
+    assert ctx != null;
+    return delegateToChild(ctx);
+  }
+
+  // ==============================================================
+  // Array Constructors - https://www.w3.org/TR/xpath-31/#id-arrays
+  // ==============================================================
+
+  @Override
+  public R visitArrayconstructor(ArrayconstructorContext ctx) {
+    assert ctx != null;
+    return delegateToChild(ctx);
+  }
+
+  /**
+   * Handle the provided expression.
+   *
+   * @param ctx
+   *          the provided expression context
+   * @return the result
+   */
+  protected abstract R handleArrayConstructor(@NonNull SquarearrayconstructorContext ctx);
+
+  /**
+   * Handle the provided expression.
+   *
+   * @param ctx
+   *          the provided expression context
+   * @return the result
+   */
+  protected abstract R handleArrayConstructor(@NonNull CurlyarrayconstructorContext ctx);
+
+  @Override
+  public R visitSquarearrayconstructor(SquarearrayconstructorContext ctx) {
+    assert ctx != null;
+    return handleArrayConstructor(ctx);
+  }
+
+  @Override
+  public R visitCurlyarrayconstructor(CurlyarrayconstructorContext ctx) {
+    assert ctx != null;
+    return handleArrayConstructor(ctx);
+  }
+
+  @Override
+  public R visitKeyspecifier(KeyspecifierContext ctx) {
+    // should never be called, since this is handled by the parent expression
+    throw new IllegalStateException();
+  }
+
+  /**
+   * Handle the provided expression.
+   *
+   * @param ctx
+   *          the provided expression context
+   * @return the result
    */
+  protected abstract R handleUnarylookup(@NonNull UnarylookupContext ctx);
+
+  @Override
+  public R visitUnarylookup(UnarylookupContext ctx) {
+    assert ctx != null;
+    return handleUnarylookup(ctx);
+  }
+
+  // =========================================================================
+  // Conditional Expressions - https://www.w3.org/TR/xpath-31/#id-conditionals
+  // =========================================================================
 
   /**
    * Handle the provided expression.
@@ -831,9 +946,12 @@ public R visitIfexpr(IfexprContext ctx) {
     return handle(ctx, (context) -> handleIfexpr(ctx));
   }
 
-  /* ==================================================================================
-   * Quantified Expressions - https://www.w3.org/TR/xpath-31/#id-quantified-expressions
-   * ==================================================================================
+  /*
+   * =============================================================================
+   * ===== Quantified Expressions -
+   * https://www.w3.org/TR/xpath-31/#id-quantified-expressions
+   * =============================================================================
+   * =====
    */
 
   /**
@@ -851,7 +969,8 @@ public R visitQuantifiedexpr(QuantifiedexprContext ctx) {
     return handleQuantifiedexpr(ctx);
   }
 
-  /* =========================================================================
+  /*
+   * =========================================================================
    * Simple map operator (!) - https://www.w3.org/TR/xpath-31/#id-map-operator
    * =========================================================================
    */
@@ -871,8 +990,9 @@ public R visitSimplemapexpr(SimplemapexprContext ctx) {
     return handle(ctx, (context) -> handleSimplemapexpr(ctx));
   }
 
-  /* =======================================================================
-   * Arrow operator (=>) - https://www.w3.org/TR/xpath-31/#id-arrow-operator
+  /*
+   * ======================================================================= Arrow
+   * operator (=>) - https://www.w3.org/TR/xpath-31/#id-arrow-operator
    * =======================================================================
    */
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java
index 637d24caf..44f7fc102 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java
@@ -47,7 +47,11 @@
 import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
+@SuppressWarnings({
+    "PMD.CouplingBetweenObjects"
+})
 public abstract class AbstractCSTVisitorBase
     extends AbstractAstVisitor<IExpression> {
 
@@ -130,6 +134,49 @@ public IExpression visit(ParseTree tree) {
     return super.visit(tree);
   }
 
+  /**
+   * Parse the provided context as an n-ary phrase.
+   *
+   * @param <CONTEXT>
+   *          the Java type of the antlr context to parse
+   * @param <T>
+   *          the Java type of the child expressions produced by this parser
+   * @param <R>
+   *          the Java type of the outer expression produced by the parser
+   * @param context
+   *          the antlr context to parse
+   * @param startIndex
+   *          the child index to start parsing on
+   * @param step
+   *          the increment to advance while parsing child expressions
+   * @param parser
+   *          a binary function used to produce child expressions
+   * @param supplier
+   *          a function used to produce the other expression
+   * @return the outer expression or {@code null} if no children exist to parse
+   */
+  @Nullable
+  protected <CONTEXT extends ParserRuleContext, T extends IExpression, R extends IExpression>
+      R nairyToCollection(
+          @NonNull CONTEXT context,
+          int startIndex,
+          int step,
+          @NonNull BiFunction<CONTEXT, Integer, T> parser,
+          @NonNull Function<List<T>, R> supplier) {
+    int numChildren = context.getChildCount();
+
+    R retval = null;
+    if (startIndex < numChildren) {
+      List<T> children = new ArrayList<>((numChildren - startIndex) / step);
+      for (int idx = startIndex; idx < numChildren; idx += step) {
+        T result = parser.apply(context, idx);
+        children.add(result);
+      }
+      retval = supplier.apply(children);
+    }
+    return retval;
+  }
+
   /**
    * Parse the provided context as an n-ary phrase, which will be one of the
    * following.
@@ -272,12 +319,11 @@ protected <CONTEXT extends ParserRuleContext> IExpression handleGroupedNAiry(
     IExpression retval = null;
     if (numChildren > 0) {
       ParseTree leftTree = context.getChild(startingIndex);
-      IExpression result = ObjectUtils.notNull(leftTree.accept(this));
+      retval = ObjectUtils.notNull(leftTree.accept(this));
 
       for (int i = startingIndex + 1; i < numChildren; i = i + step) {
-        result = parser.apply(context, i, result);
+        retval = parser.apply(context, i, retval);
       }
-      retval = result;
     }
     return retval;
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpression.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpression.java
index 967b413c2..b60654f2f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpression.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpression.java
@@ -28,9 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
 import gov.nist.secauto.metaschema.core.metapath.TypeMetapathException;
-import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
 import gov.nist.secauto.metaschema.core.metapath.function.library.FnData;
-import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -54,9 +52,7 @@ public abstract class AbstractExpression implements IExpression {
   @Nullable
   public static IAnyAtomicItem getFirstDataItem(@NonNull ISequence<?> sequence,
       boolean requireSingleton) {
-    IItem item = FunctionUtils.getFirstItem(sequence, requireSingleton);
-
-    return item == null ? null : FnData.fnDataItem(item);
+    return FnData.fnData(sequence).getFirstItem(requireSingleton);
   }
 
   @Override
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpressionVisitor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpressionVisitor.java
index 24e5fe06e..d83c8b90b 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpressionVisitor.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractExpressionVisitor.java
@@ -35,14 +35,17 @@
 import gov.nist.secauto.metaschema.core.metapath.cst.math.Multiplication;
 import gov.nist.secauto.metaschema.core.metapath.cst.math.Subtraction;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Axis;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.ContextItem;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Flag;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.ModelInstance;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.NameTest;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootDoubleSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashOnlyPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Step;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.Wildcard;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -56,7 +59,7 @@
  * @param <CONTEXT>
  *          additional state to pass between nodes visited
  */
-@SuppressWarnings("PMD.CouplingBetweenObjects")
+@SuppressWarnings({ "PMD.CouplingBetweenObjects", "PMD.ExcessivePublicCount" })
 public abstract class AbstractExpressionVisitor<RESULT, CONTEXT> implements IExpressionVisitor<RESULT, CONTEXT> {
 
   /**
@@ -202,7 +205,7 @@ public RESULT visitFlag(Flag expr, CONTEXT context) {
   }
 
   @Override
-  public RESULT visitFunctionCall(FunctionCall expr, CONTEXT context) {
+  public RESULT visitFunctionCall(StaticFunctionCall expr, CONTEXT context) {
     return visitChildren(expr, context);
   }
 
@@ -242,7 +245,7 @@ public RESULT visitMultiplication(Multiplication expr, CONTEXT context) {
   }
 
   @Override
-  public RESULT visitName(Name expr, CONTEXT context) {
+  public RESULT visitName(NameTest expr, CONTEXT context) {
     return defaultResult();
   }
 
@@ -257,7 +260,7 @@ public RESULT visitOr(Or expr, CONTEXT context) {
   }
 
   @Override
-  public RESULT visitPredicate(Predicate expr, CONTEXT context) {
+  public RESULT visitPredicate(PredicateExpression expr, CONTEXT context) {
     return visitChildren(expr, context);
   }
 
@@ -350,4 +353,39 @@ public RESULT visitFor(For expr, CONTEXT context) {
   public RESULT visitSimpleMap(SimpleMap expr, CONTEXT context) {
     return visitChildren(expr, context);
   }
+
+  @Override
+  public RESULT visitMapConstructor(MapConstructor expr, CONTEXT context) {
+    return visitChildren(expr, context);
+  }
+
+  @Override
+  public RESULT visitMapConstructorEntry(MapConstructor.Entry expr, CONTEXT context) {
+    return visitChildren(expr, context);
+  }
+
+  @Override
+  public RESULT visitArray(ArraySequenceConstructor expr, CONTEXT context) {
+    return visitChildren(expr, context);
+  }
+
+  @Override
+  public RESULT visitArray(ArraySquareConstructor expr, CONTEXT context) {
+    return visitChildren(expr, context);
+  }
+
+  @Override
+  public RESULT visitPostfixLookup(PostfixLookup expr, CONTEXT context) {
+    return visitChildren(expr, context);
+  }
+
+  @Override
+  public RESULT visitFunctionCallAccessor(FunctionCallAccessor expr, CONTEXT context) {
+    return visitChildren(expr, context);
+  }
+
+  @Override
+  public RESULT visitUnaryLookup(UnaryLookup expr, CONTEXT context) {
+    return defaultResult();
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractFilterExpression.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractFilterExpression.java
index 0408ab3ed..5b20b87ff 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractFilterExpression.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractFilterExpression.java
@@ -71,7 +71,7 @@ public ISequence<? extends IItem> accept(
 
     ISequence<?> left = getLeft().accept(dynamicContext, focus);
     ISequence<?> right = getRight().accept(dynamicContext, focus);
-    List<? extends IItem> rightList = right.asList();
+    List<? extends IItem> rightList = right.getValue();
 
     return applyFilterTo(left, rightList);
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractLookup.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractLookup.java
new file mode 100644
index 000000000..752b242f8
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractLookup.java
@@ -0,0 +1,66 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.cst;
+
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IKeySpecifier;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * An implementation of
+ * <a href="https://www.w3.org/TR/xpath-31/#id-lookup">Lookup Operators</a>
+ * supporting access to items in Metapath maps and arrays.
+ * <p>
+ * Provides support for various types of key- and index-based lookups related to
+ * {@link IMapItem} and {@link IArrayItem} objects.
+ */
+public abstract class AbstractLookup implements IExpression {
+  @NonNull
+  private final IKeySpecifier keySpecifier;
+
+  /**
+   * Construct a new lookup expression that uses the provided key specifier.
+   *
+   * @param keySpecifier
+   *          the key specifier that identifies how to lookup entries
+   */
+  protected AbstractLookup(@NonNull IKeySpecifier keySpecifier) {
+    this.keySpecifier = keySpecifier;
+  }
+
+  /**
+   * Get the key specifier implementation.
+   *
+   * @return the key specifier
+   */
+  @NonNull
+  public IKeySpecifier getKeySpecifier() {
+    return keySpecifier;
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractNamedInstanceExpression.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractNamedInstanceExpression.java
index 69d79049f..1c00129d1 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractNamedInstanceExpression.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/AbstractNamedInstanceExpression.java
@@ -27,6 +27,8 @@
 package gov.nist.secauto.metaschema.core.metapath.cst;
 
 import gov.nist.secauto.metaschema.core.metapath.cst.path.AbstractPathExpression;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.NameTest;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.Wildcard;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 
 import java.util.List;
@@ -50,7 +52,7 @@ public AbstractNamedInstanceExpression(@NonNull IExpression test) {
   }
 
   /**
-   * Get the {@link Wildcard} or {@link Name} test.
+   * Get the {@link Wildcard} or {@link NameTest} test.
    *
    * @return the test
    */
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ArraySequenceConstructor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ArraySequenceConstructor.java
new file mode 100644
index 000000000..f80aa6979
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ArraySequenceConstructor.java
@@ -0,0 +1,91 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.cst;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+/**
+ * An implementation of the
+ * <a href="https://www.w3.org/TR/xpath-31/#id-array-constructors">Array Curly
+ * Constructor</a> supporting the creation of a Metapath {@link IArrayItem}.
+ */
+public class ArraySequenceConstructor implements IExpression {
+  @Nullable
+  private final IExpression expr;
+
+  /**
+   * Construct a new array constructor expression that uses the provided
+   * expression to initialize the array.
+   *
+   * @param expr
+   *          the expression used to produce the array members
+   */
+  public ArraySequenceConstructor(@Nullable IExpression expr) {
+    this.expr = expr;
+  }
+
+  @SuppressWarnings("rawtypes")
+  @Override
+  public Class<IArrayItem> getBaseResultType() {
+    return IArrayItem.class;
+  }
+
+  @SuppressWarnings("rawtypes")
+  @Override
+  public Class<IArrayItem> getStaticResultType() {
+    return IArrayItem.class;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public List<? extends IExpression> getChildren() {
+    return List.of(expr);
+  }
+
+  @Override
+  public ISequence<IArrayItem<?>> accept(DynamicContext dynamicContext, ISequence<?> focus) {
+    ISequence<IArrayItem<?>> retval;
+    if (expr != null) {
+      IArrayItem<?> array = IArrayItem.ofCollection(expr.accept(dynamicContext, focus));
+      retval = ISequence.of(array);
+    } else {
+      retval = ISequence.of();
+    }
+    return retval;
+  }
+
+  @Override
+  public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visitor, CONTEXT context) {
+    return visitor.visitArray(this, context);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Wildcard.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ArraySquareConstructor.java
similarity index 62%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Wildcard.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ArraySquareConstructor.java
index 087e7cdf5..f670e2e54 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Wildcard.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ArraySquareConstructor.java
@@ -28,43 +28,51 @@
 
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
-import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
 
-import java.util.Collections;
 import java.util.List;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 /**
- * The CST node for a Metapath
- * <a href="https://www.w3.org/TR/xpath-31/#doc-xpath31-Wildcard">wildcard name
- * test</a>.
+ * An implementation of the
+ * <a href="https://www.w3.org/TR/xpath-31/#id-array-constructors">Array Square
+ * Constructor</a> supporting the creation of a Metapath {@link IArrayItem}.
  */
-public class Wildcard implements IExpression {
-  @SuppressWarnings("null")
-  @Override
-  public List<? extends IExpression> getChildren() {
-    return Collections.emptyList();
-  }
+public class ArraySquareConstructor implements IExpression {
+  @NonNull
+  private final List<IExpression> children;
 
-  @Override
-  public Class<INodeItem> getBaseResultType() {
-    return INodeItem.class;
+  /**
+   * Construct a new array constructor expression that uses the provided
+   * expression to initialize the array.
+   * <p>
+   * Each resulting array member contains the value of the corresponding argument
+   * expression.
+   *
+   * @param children
+   *          the expressions used to produce the array members
+   */
+  public ArraySquareConstructor(@NonNull List<IExpression> children) {
+    this.children = children;
   }
 
   @Override
-  public Class<INodeItem> getStaticResultType() {
-    return getBaseResultType();
+  public List<? extends IExpression> getChildren() {
+    return children;
   }
 
   @Override
-  public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visitor, CONTEXT context) {
-    return visitor.visitWildcard(this, context);
+  public ISequence<? extends IItem> accept(DynamicContext dynamicContext, ISequence<?> focus) {
+    return ISequence.of(getChildren().stream()
+        .map(expr -> expr.accept(dynamicContext, focus))
+        .map(ISequence::toCollectionValue)
+        .collect(IArrayItem.toArrayItem()));
   }
 
   @Override
-  public ISequence<? extends INodeItem> accept(
-      DynamicContext dynamicContext, ISequence<?> focus) {
-    return ISequence.of(focus.asStream()
-        .map(item -> ItemUtils.checkItemIsNodeItemForStep(item)));
+  public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visitor, CONTEXT context) {
+    return visitor.visitArray(this, context);
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCSTVisitor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCSTVisitor.java
index 157a3875a..f2f407b05 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCSTVisitor.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCSTVisitor.java
@@ -26,6 +26,8 @@
 
 package gov.nist.secauto.metaschema.core.metapath.cst;
 
+import gov.nist.secauto.metaschema.core.metapath.EQNameUtils;
+import gov.nist.secauto.metaschema.core.metapath.StaticContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.AbbrevforwardstepContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.AbbrevreversestepContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.AdditiveexprContext;
@@ -36,6 +38,7 @@
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.AxisstepContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ComparisonexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ContextitemexprContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.CurlyarrayconstructorContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.EqnameContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ExprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ExprsingleContext;
@@ -45,9 +48,15 @@
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.GeneralcompContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.IfexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.IntersectexceptexprContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.KeyspecifierContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.LetexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.LiteralContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.LookupContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.MapconstructorContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.MapconstructorentryContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.MultiplicativeexprContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.NametestContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.NodetestContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.NumericliteralContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.OrexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ParenthesizedexprContext;
@@ -63,8 +72,10 @@
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.SimpleletbindingContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.SimpleletclauseContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.SimplemapexprContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.SquarearrayconstructorContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.StringconcatexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.UnaryexprContext;
+import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.UnarylookupContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.UnionexprContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.ValuecompContext;
 import gov.nist.secauto.metaschema.core.metapath.antlr.Metapath10.VarnameContext;
@@ -80,15 +91,24 @@
 import gov.nist.secauto.metaschema.core.metapath.cst.math.Multiplication;
 import gov.nist.secauto.metaschema.core.metapath.cst.math.Subtraction;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Axis;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.ContextItem;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Flag;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.INameTestExpression;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.INodeTestExpression;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.ModelInstance;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.NameTest;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootDoubleSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashOnlyPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Step;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.Wildcard;
 import gov.nist.secauto.metaschema.core.metapath.function.ComparisonFunctions;
+import gov.nist.secauto.metaschema.core.metapath.impl.AbstractKeySpecifier;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IKeySpecifier;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -103,9 +123,12 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -119,11 +142,32 @@
 })
 public class BuildCSTVisitor
     extends AbstractCSTVisitorBase {
+  @NonNull
+  private final StaticContext context;
+
+  /**
+   * Construct a new compact syntax tree generating visitor.
+   *
+   * @param context
+   *          the static Metapath evaluation context
+   */
+  public BuildCSTVisitor(@NonNull StaticContext context) {
+    this.context = context;
+  }
 
-  /* ============================================================
-   * Expressions - https://www.w3.org/TR/xpath-31/#id-expressions
-   * ============================================================
+  // ============================================================
+  // Expressions - https://www.w3.org/TR/xpath-31/#id-expressions
+  // ============================================================
+
+  /**
+   * Get the static Metapath evaluation context.
+   *
+   * @return the context
    */
+  @NonNull
+  protected StaticContext getContext() {
+    return context;
+  }
 
   @Override
   protected IExpression handleExpr(ExprContext ctx) {
@@ -133,10 +177,9 @@ protected IExpression handleExpr(ExprContext ctx) {
     });
   }
 
-  /* =================================================================
-   * Literal Expressions - https://www.w3.org/TR/xpath-31/#id-literals
-   * =================================================================
-   */
+  // =================================================================
+  // Literal Expressions - https://www.w3.org/TR/xpath-31/#id-literals
+  // =================================================================
 
   @Override
   protected IExpression handleStringLiteral(LiteralContext ctx) {
@@ -163,42 +206,252 @@ protected IExpression handleNumericLiteral(NumericliteralContext ctx) {
     return retval;
   }
 
-  /* ==================================================================
-   * Variable References - https://www.w3.org/TR/xpath-31/#id-variables
-   * ==================================================================
-   */
+  // ==================================================================
+  // Variable References - https://www.w3.org/TR/xpath-31/#id-variables
+  // ==================================================================
 
   @Override
   protected IExpression handleVarref(VarrefContext ctx) {
-    Name varName = (Name) ctx.varname().accept(this);
-    assert varName != null;
-    return new VariableReference(varName);
+    return new VariableReference(
+        EQNameUtils.parseName(
+            ObjectUtils.notNull(ctx.varname().eqname().getText()),
+            getContext().getVariablePrefixResolver()));
   }
 
-  /* =================================================================================
-   * Parenthesized Expressions  - https://www.w3.org/TR/xpath-31/#id-paren-expressions
-   * =================================================================================
-   */
+  // ====================================================================
+  // For Expressions - https://www.w3.org/TR/xpath-31/#id-for-expressions
+  // ====================================================================
+
+  @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
+  @Override
+  protected IExpression handleForexpr(ForexprContext ctx) {
+    SimpleforclauseContext simpleForClause = ctx.simpleforclause();
+
+    // for SimpleForBinding ("," SimpleForBinding)*
+    int bindingCount = simpleForClause.getChildCount() / 2;
+
+    @NonNull IExpression retval = ObjectUtils.notNull(ctx.exprsingle().accept(this));
+
+    // step through in reverse
+    for (int idx = bindingCount - 1; idx >= 0; idx--) {
+      SimpleforbindingContext simpleForBinding = simpleForClause.simpleforbinding(idx);
+
+      VarnameContext varName = simpleForBinding.varname();
+      ExprsingleContext exprSingle = simpleForBinding.exprsingle();
+
+      IExpression boundExpression = exprSingle.accept(this);
+      assert boundExpression != null;
+
+      QName qname = EQNameUtils.parseName(
+          ObjectUtils.notNull(varName.eqname().getText()),
+          getContext().getVariablePrefixResolver());
+
+      Let.VariableDeclaration variable = new Let.VariableDeclaration(qname, boundExpression);
+
+      retval = new For(variable, retval);
+    }
+    return retval;
+  }
+
+  // ====================================================================
+  // Let Expressions - https://www.w3.org/TR/xpath-31/#id-let-expressions
+  // ====================================================================
+
+  @Override
+  protected IExpression handleLet(LetexprContext context) {
+    @NonNull IExpression retval = ObjectUtils.notNull(context.exprsingle().accept(this));
+
+    SimpleletclauseContext letClause = context.simpleletclause();
+    List<SimpleletbindingContext> clauses = letClause.simpleletbinding();
+
+    ListIterator<SimpleletbindingContext> reverseListIterator = clauses.listIterator(clauses.size());
+    while (reverseListIterator.hasPrevious()) {
+      SimpleletbindingContext simpleCtx = reverseListIterator.previous();
+
+      IExpression boundExpression = simpleCtx.exprsingle().accept(this);
+      assert boundExpression != null;
+
+      QName varName = EQNameUtils.parseName(
+          ObjectUtils.notNull(simpleCtx.varname().eqname().getText()),
+          getContext().getVariablePrefixResolver());
+
+      retval = new Let(varName, boundExpression, retval); // NOPMD intended
+    }
+    return retval;
+  }
+
+  // ======================================================================
+  // Map Constructors - https://www.w3.org/TR/xpath-31/#id-map-constructors
+  // ======================================================================
+
+  @Override
+  protected MapConstructor handleMapConstructor(MapconstructorContext context) {
+    return context.getChildCount() == 3
+        // empty
+        ? new MapConstructor(CollectionUtil.emptyList())
+        // with members
+        : nairyToCollection(context, 3, 2,
+            (ctx, idx) -> {
+              int pos = (idx - 3) / 2;
+              MapconstructorentryContext entry = ctx.mapconstructorentry(pos);
+              assert entry != null;
+              return new MapConstructor.Entry(
+                  ObjectUtils.notNull(entry.mapkeyexpr().accept(this)),
+                  ObjectUtils.notNull(entry.mapvalueexpr().accept(this)));
+            },
+            children -> {
+              assert children != null;
+              return new MapConstructor(children);
+            });
+  }
+
+  // ==============================================================
+  // Array Constructors - https://www.w3.org/TR/xpath-31/#id-arrays
+  // ==============================================================
+
+  @Override
+  protected IExpression handleArrayConstructor(SquarearrayconstructorContext context) {
+    return context.getChildCount() == 2
+        // empty
+        ? new ArraySquareConstructor(CollectionUtil.emptyList())
+        // with members
+        : nairyToCollection(context, 1, 2,
+            (ctx, idx) -> {
+              int pos = (idx - 1) / 2;
+              ParseTree tree = ctx.exprsingle(pos);
+              return visit(tree);
+            },
+            children -> {
+              assert children != null;
+              return new ArraySquareConstructor(children);
+            });
+  }
+
+  @Override
+  protected IExpression handleArrayConstructor(CurlyarrayconstructorContext ctx) {
+    return new ArraySequenceConstructor(visit(ctx.enclosedexpr()));
+  }
+
+  // ===============================================
+  // Unary Lookup -
+  // https://www.w3.org/TR/xpath-31/#id-unary-lookup
+  // ===============================================
+
+  @Override
+  protected IExpression handleUnarylookup(UnarylookupContext ctx) {
+    KeyspecifierContext specifier = ctx.keyspecifier();
+
+    IKeySpecifier keySpecifier;
+    if (specifier.parenthesizedexpr() != null) {
+      keySpecifier = AbstractKeySpecifier.newParenthesizedExprKeySpecifier(
+          ObjectUtils.requireNonNull(specifier.parenthesizedexpr().accept(this)));
+    } else if (specifier.NCName() != null) {
+      keySpecifier = AbstractKeySpecifier.newNameKeySpecifier(
+          ObjectUtils.requireNonNull(specifier.NCName().getText()));
+    } else if (specifier.IntegerLiteral() != null) {
+      keySpecifier = AbstractKeySpecifier.newIntegerLiteralKeySpecifier(
+          IIntegerItem.valueOf(ObjectUtils.requireNonNull(specifier.IntegerLiteral().getText())));
+    } else if (specifier.STAR() != null) {
+      keySpecifier = AbstractKeySpecifier.newWildcardKeySpecifier();
+    } else {
+      throw new UnsupportedOperationException("unknown key specifier");
+    }
+    return new UnaryLookup(keySpecifier);
+  }
+
+  // =========================================================
+  // Quantified Expressions -
+  // https://www.w3.org/TR/xpath-31/#id-quantified-expressions
+  // =========================================================
+
+  @Override
+  protected IExpression handleQuantifiedexpr(QuantifiedexprContext ctx) {
+    Quantified.Quantifier quantifier;
+    int type = ((TerminalNode) ctx.getChild(0)).getSymbol().getType();
+    switch (type) {
+    case Metapath10Lexer.KW_SOME:
+      quantifier = Quantified.Quantifier.SOME;
+      break;
+    case Metapath10Lexer.KW_EVERY:
+      quantifier = Quantified.Quantifier.EVERY;
+      break;
+    default:
+      throw new UnsupportedOperationException(((TerminalNode) ctx.getChild(0)).getSymbol().getText());
+    }
+
+    int numVars = (ctx.getChildCount() - 2) / 5; // children - "satisfies expr" / ", $ varName in expr"
+    Map<QName, IExpression> vars = new LinkedHashMap<>(); // NOPMD ordering needed
+    int offset = 0;
+    for (; offset < numVars; offset++) {
+      // $
+      QName varName = EQNameUtils.parseName(
+          ObjectUtils.notNull(ctx.varname(offset).eqname().getText()),
+          getContext().getVariablePrefixResolver());
+
+      // in
+      IExpression varExpr = visit(ctx.exprsingle(offset));
+
+      vars.put(varName, varExpr);
+    }
+
+    IExpression satisfies = visit(ctx.exprsingle(offset));
+
+    return new Quantified(quantifier, vars, satisfies);
+  }
+
+  // =======================================================================
+  // Arrow operator (=>) - https://www.w3.org/TR/xpath-31/#id-arrow-operator
+  // =======================================================================
+
+  @Override
+  protected IExpression handleArrowexpr(ArrowexprContext context) {
+    // TODO: handle additional syntax for varef and parenthesized
+    return handleGroupedNAiry(context, 0, 3, (ctx, idx, left) -> {
+      // the next child is "=>"
+      assert "=>".equals(ctx.getChild(idx).getText());
+
+      int offset = (idx - 1) / 3;
+
+      ArrowfunctionspecifierContext fcCtx = ctx.getChild(ArrowfunctionspecifierContext.class, offset);
+      ArgumentlistContext argumentCtx = ctx.getChild(ArgumentlistContext.class, offset);
+
+      QName name = EQNameUtils.parseName(
+          ObjectUtils.notNull(fcCtx.eqname().getText()),
+          getContext().getFunctionPrefixResolver());
+
+      try (Stream<IExpression> args = Stream.concat(
+          Stream.of(left),
+          parseArgumentList(ObjectUtils.notNull(argumentCtx)))) {
+        assert args != null;
+
+        return new StaticFunctionCall(name, ObjectUtils.notNull(args.collect(Collectors.toUnmodifiableList())));
+      }
+    });
+  }
+
+  // ====================================================
+  // Parenthesized Expressions -
+  // https://www.w3.org/TR/xpath-31/#id-paren-expressions
+  // ====================================================
 
   @Override
   protected IExpression handleEmptyParenthesizedexpr(ParenthesizedexprContext ctx) {
     return EmptySequence.instance();
   }
 
-  /* =====================================================================================
-   * Context Item Expression  - https://www.w3.org/TR/xpath-31/#id-context-item-expression
-   * =====================================================================================
-   */
+  // ==========================================================
+  // Context Item Expression -
+  // https://www.w3.org/TR/xpath-31/#id-context-item-expression
+  // ==========================================================
 
   @Override
   protected IExpression handleContextitemexpr(ContextitemexprContext ctx) {
     return ContextItem.instance();
   }
 
-  /* =========================================================================
-   * Static Function Calls - https://www.w3.org/TR/xpath-31/#id-function-calls
-   * =========================================================================
-   */
+  // =========================================================================
+  // Static Function Calls - https://www.w3.org/TR/xpath-31/#id-function-calls
+  // =========================================================================
 
   /**
    * Parse a list of arguments.
@@ -229,21 +482,18 @@ protected Stream<IExpression> parseArgumentList(@NonNull ArgumentlistContext con
 
   @Override
   protected IExpression handleFunctioncall(FunctioncallContext ctx) {
-    EqnameContext nameCtx = ctx.eqname();
-    String name = nameCtx.getText();
-
-    assert name != null;
-
-    return new FunctionCall(
-        name,
+    QName qname = EQNameUtils.parseName(
+        ObjectUtils.notNull(ctx.eqname().getText()),
+        getContext().getFunctionPrefixResolver());
+    return new StaticFunctionCall(
+        qname,
         ObjectUtils.notNull(parseArgumentList(ObjectUtils.notNull(ctx.argumentlist()))
             .collect(Collectors.toUnmodifiableList())));
   }
 
-  /* =========================================================================
-   * Filter Expressions - https://www.w3.org/TR/xpath-31/#id-filter-expression
-   * =========================================================================
-   */
+  // =========================================================================
+  // Filter Expressions - https://www.w3.org/TR/xpath-31/#id-filter-expression
+  // =========================================================================
 
   /**
    * Parse a predicate AST.
@@ -293,22 +543,66 @@ protected List<IExpression> parsePredicates(@NonNull ParseTree context, int star
   }
 
   @Override
-  protected IExpression handlePostfixexpr(PostfixexprContext ctx) {
-    int numChildren = ctx.getChildCount();
-    ParseTree primaryTree = ctx.getChild(0);
-    IExpression retval = ObjectUtils.notNull(primaryTree.accept(this));
+  protected IExpression handlePostfixexpr(PostfixexprContext context) {
+    return handleGroupedNAiry(
+        context,
+        0,
+        1,
+        (ctx, idx, left) -> {
+          assert left != null;
+
+          ParseTree tree = ctx.getChild(idx);
+          IExpression result;
+          if (tree instanceof ArgumentlistContext) {
+            // map or array access using function call syntax
+            result = new FunctionCallAccessor(
+                left,
+                ObjectUtils.notNull(parseArgumentList((ArgumentlistContext) tree).findFirst().get()));
+          } else if (tree instanceof PredicateContext) {
+            result = new PredicateExpression(
+                left,
+                CollectionUtil.singletonList(parsePredicate((PredicateContext) tree)));
+          } else if (tree instanceof LookupContext) {
+            KeyspecifierContext specifier = ((LookupContext) tree).keyspecifier();
+
+            IKeySpecifier keySpecifier;
+            if (specifier.parenthesizedexpr() != null) {
+              keySpecifier = AbstractKeySpecifier.newParenthesizedExprKeySpecifier(
+                  ObjectUtils.requireNonNull(specifier.parenthesizedexpr().accept(this)));
+            } else if (specifier.NCName() != null) {
+              keySpecifier = AbstractKeySpecifier.newNameKeySpecifier(
+                  ObjectUtils.requireNonNull(specifier.NCName().getText()));
+            } else if (specifier.IntegerLiteral() != null) {
+              keySpecifier = AbstractKeySpecifier.newIntegerLiteralKeySpecifier(
+                  IIntegerItem.valueOf(ObjectUtils.requireNonNull(specifier.IntegerLiteral().getText())));
+            } else if (specifier.STAR() != null) {
+              keySpecifier = AbstractKeySpecifier.newWildcardKeySpecifier();
+            } else {
+              throw new UnsupportedOperationException("unknown key specifier");
+            }
+            result = new PostfixLookup(left, keySpecifier);
+          } else {
+            result = visit(tree);
+          }
+          return result;
+        });
+  }
 
-    List<IExpression> predicates = numChildren > 1 ? parsePredicates(ctx, 1) : CollectionUtil.emptyList();
+  // ======================================================================
+  // Path Expressions - https://www.w3.org/TR/xpath-31/#id-path-expressions
+  // ======================================================================
 
-    if (!predicates.isEmpty()) {
-      retval = new Predicate(retval, predicates);
-    }
-    return retval;
+  @Override
+  protected IExpression handlePredicate(PredicateContext ctx) {
+    parsePredicate(ctx);
+    return null;
+  }
+
+  @Override
+  protected IExpression handleLookup(LookupContext ctx) {
+    // TODO Auto-generated method stub
+    return null;
   }
-  /* ======================================================================
-   * Path Expressions - https://www.w3.org/TR/xpath-31/#id-path-expressions
-   * ======================================================================
-   */
 
   @Override
   protected IExpression handlePathexpr(PathexprContext ctx) {
@@ -342,10 +636,10 @@ protected IExpression handlePathexpr(PathexprContext ctx) {
     return retval;
   }
 
-  /* =======================================================================================
-   * RelativePath Expressions - https://www.w3.org/TR/xpath-31/#id-relative-path-expressions
-   * =======================================================================================
-   */
+  // ============================================================
+  // RelativePath Expressions -
+  // https://www.w3.org/TR/xpath-31/#id-relative-path-expressions
+  // ============================================================
 
   @Override
   protected IExpression handleRelativepathexpr(RelativepathexprContext context) {
@@ -372,35 +666,45 @@ protected IExpression handleRelativepathexpr(RelativepathexprContext context) {
     });
   }
 
-  /* ================================================
-   * Steps - https://www.w3.org/TR/xpath-31/#id-steps
-   * ================================================
-   */
+  // ================================================
+  // Steps - https://www.w3.org/TR/xpath-31/#id-steps
+  // ================================================
 
   @Override
   protected IExpression handleForwardstep(ForwardstepContext ctx) {
-    assert ctx.getChildCount() == 2;
+    AbbrevforwardstepContext abbrev = ctx.abbrevforwardstep();
 
-    Token token = (Token) ctx.forwardaxis().getChild(0).getPayload();
+    Step retval;
+    if (abbrev == null) {
+      assert ctx.getChildCount() == 2;
 
-    Axis axis;
-    switch (token.getType()) {
-    case Metapath10Lexer.KW_SELF:
-      axis = Axis.SELF;
-      break;
-    case Metapath10Lexer.KW_CHILD:
-      axis = Axis.CHILDREN;
-      break;
-    case Metapath10Lexer.KW_DESCENDANT:
-      axis = Axis.DESCENDANT;
-      break;
-    case Metapath10Lexer.KW_DESCENDANT_OR_SELF:
-      axis = Axis.DESCENDANT_OR_SELF;
-      break;
-    default:
-      throw new UnsupportedOperationException(token.getText());
+      Token token = (Token) ctx.forwardaxis().getChild(0).getPayload();
+
+      Axis axis;
+      switch (token.getType()) {
+      case Metapath10Lexer.KW_SELF:
+        axis = Axis.SELF;
+        break;
+      case Metapath10Lexer.KW_CHILD:
+        axis = Axis.CHILDREN;
+        break;
+      case Metapath10Lexer.KW_DESCENDANT:
+        axis = Axis.DESCENDANT;
+        break;
+      case Metapath10Lexer.KW_DESCENDANT_OR_SELF:
+        axis = Axis.DESCENDANT_OR_SELF;
+        break;
+      default:
+        throw new UnsupportedOperationException(token.getText());
+      }
+      retval = new Step(axis,
+          parseNodeTest(ctx.nodetest(), false));
+    } else {
+      retval = new Step(
+          Axis.CHILDREN,
+          parseNodeTest(ctx.nodetest(), abbrev.AT() != null));
     }
-    return new Step(axis, visit(ctx.nametest()));
+    return retval;
   }
 
   @Override
@@ -423,49 +727,97 @@ protected IExpression handleReversestep(ReversestepContext ctx) {
     default:
       throw new UnsupportedOperationException(token.getText());
     }
-    return new Step(axis, visit(ctx.nametest()));
+    return new Step(axis, parseNodeTest(ctx.nodetest(), false));
   }
 
-  /* ======================================================================
-   * Predicates within Steps - https://www.w3.org/TR/xpath-31/#id-predicate
-   * ======================================================================
-   */
-
-  @Override
-  protected IExpression handleAxisstep(AxisstepContext ctx) {
-    IExpression step = visit(ctx.getChild(0));
-    ParseTree predicateTree = ctx.getChild(1);
-    assert predicateTree != null;
-
-    List<IExpression> predicates = parsePredicates(predicateTree, 0);
+  // =======================================================
+  // Node Tests - https://www.w3.org/TR/xpath-31/#node-tests
+  // =======================================================
 
-    return predicates.isEmpty() ? step : new Predicate(step, predicates);
+  /**
+   * Parse an antlr node test expression.
+   *
+   * @param ctx
+   *          the antrl context
+   * @param flag
+   *          if the context is within a flag's scope
+   * @return the resulting expression
+   */
+  @NonNull
+  protected INodeTestExpression parseNodeTest(NodetestContext ctx, boolean flag) {
+    // TODO: implement kind test
+    NametestContext nameTestCtx = ctx.nametest();
+    return parseNameTest(nameTestCtx, flag);
   }
 
-  /* =======================================================
-   * Node Tests - https://www.w3.org/TR/xpath-31/#node-tests
-   * =======================================================
+  /**
+   * Parse an antlr name test expression.
+   *
+   * @param ctx
+   *          the antrl context
+   * @param flag
+   *          if the context is within a flag's scope
+   * @return the resulting expression
    */
+  @NonNull
+  protected INameTestExpression parseNameTest(NametestContext ctx, boolean flag) {
+    ParseTree testType = ObjectUtils.requireNonNull(ctx.getChild(0));
+    INameTestExpression retval;
+    if (testType instanceof EqnameContext) {
+      QName qname = EQNameUtils.parseName(
+          ObjectUtils.notNull(ctx.eqname().getText()),
+          flag ? getContext().getFlagPrefixResolver() : getContext().getModelPrefixResolver());
+      retval = new NameTest(qname);
+    } else { // wildcard
+      retval = handleWildcard((WildcardContext) testType);
+    }
+    return retval;
+  }
 
   @Override
-  protected IExpression handleEqname(EqnameContext ctx) {
-    ParseTree tree = ctx.getChild(0);
-    String name = ((TerminalNode) tree).getText();
-
-    assert name != null;
+  protected Wildcard handleWildcard(WildcardContext ctx) {
+    Predicate<IDefinitionNodeItem<?, ?>> matcher = null;
+    if (ctx.STAR() == null) {
+      if (ctx.CS() != null) {
+        // specified prefix, any local-name
+        String prefix = ObjectUtils.notNull(ctx.NCName().getText());
+        String namespace = getContext().lookupNamespaceForPrefix(prefix);
+        if (namespace == null) {
+          throw new IllegalStateException(String.format("Prefix '%s' did not map to a namespace.", prefix));
+        }
+        matcher = new Wildcard.MatchAnyLocalName(namespace);
+      } else if (ctx.SC() != null) {
+        // any prefix, specified local-name
+        matcher = new Wildcard.MatchAnyNamespace(ObjectUtils.notNull(ctx.NCName().getText()));
+      } else {
+        // specified braced namespace, any local-name
+        String bracedUriLiteral = ctx.BracedURILiteral().getText();
+        String namespace = ObjectUtils.notNull(bracedUriLiteral.substring(2, bracedUriLiteral.length() - 1));
+        matcher = new Wildcard.MatchAnyLocalName(namespace);
+      }
+    } // star needs no matcher: any prefix, any local-name
 
-    return new Name(name);
+    return new Wildcard(matcher);
   }
 
+  // ======================================================================
+  // Predicates within Steps - https://www.w3.org/TR/xpath-31/#id-predicate
+  // ======================================================================
+
   @Override
-  protected IExpression handleWildcard(WildcardContext ctx) {
-    return new Wildcard();
+  protected IExpression handleAxisstep(AxisstepContext ctx) {
+    IExpression step = visit(ctx.getChild(0));
+    ParseTree predicateTree = ctx.getChild(1);
+    assert predicateTree != null;
+
+    List<IExpression> predicates = parsePredicates(predicateTree, 0);
+
+    return predicates.isEmpty() ? step : new PredicateExpression(step, predicates);
   }
 
-  /* ===========================================================
-   * Abbreviated Syntax - https://www.w3.org/TR/xpath-31/#abbrev
-   * ===========================================================
-   */
+  // ===========================================================
+  // Abbreviated Syntax - https://www.w3.org/TR/xpath-31/#abbrev
+  // ===========================================================
 
   @Override
   protected IExpression handleAbbrevforwardstep(AbbrevforwardstepContext ctx) {
@@ -473,10 +825,10 @@ protected IExpression handleAbbrevforwardstep(AbbrevforwardstepContext ctx) {
 
     IExpression retval;
     if (numChildren == 1) {
-      retval = new ModelInstance(visit(ctx.getChild(0)));
+      retval = new ModelInstance(parseNodeTest(ctx.nodetest(), false));
     } else {
       // this is an AT test
-      retval = new Flag(visit(ctx.getChild(1)));
+      retval = new Flag(parseNodeTest(ctx.nodetest(), true));
     }
     return retval;
   }
@@ -486,10 +838,9 @@ protected IExpression handleAbbrevreversestep(AbbrevreversestepContext ctx) {
     return Axis.PARENT;
   }
 
-  /* ======================================================================
-   * Constructing Sequences - https://www.w3.org/TR/xpath-31/#construct_seq
-   * ======================================================================
-   */
+  // ======================================================================
+  // Constructing Sequences - https://www.w3.org/TR/xpath-31/#construct_seq
+  // ======================================================================
 
   @Override
   protected IExpression handleRangeexpr(RangeexprContext ctx) {
@@ -501,10 +852,9 @@ protected IExpression handleRangeexpr(RangeexprContext ctx) {
     return new Range(left, right);
   }
 
-  /* ========================================================================
-   * Combining Node Sequences - https://www.w3.org/TR/xpath-31/#combining_seq
-   * ========================================================================
-   */
+  // ========================================================================
+  // Combining Node Sequences - https://www.w3.org/TR/xpath-31/#combining_seq
+  // ========================================================================
 
   @Override
   protected IExpression handleUnionexpr(UnionexprContext ctx) {
@@ -539,10 +889,9 @@ protected IExpression handleIntersectexceptexpr(IntersectexceptexprContext conte
     });
   }
 
-  /* ======================================================================
-   * Arithmetic Expressions - https://www.w3.org/TR/xpath-31/#id-arithmetic
-   * ======================================================================
-   */
+  // ======================================================================
+  // Arithmetic Expressions - https://www.w3.org/TR/xpath-31/#id-arithmetic
+  // ======================================================================
 
   @Override
   protected IExpression handleAdditiveexpr(AdditiveexprContext context) {
@@ -630,10 +979,10 @@ protected IExpression handleUnaryexpr(UnaryexprContext ctx) {
     return retval;
   }
 
-  /* ========================================================================================
-   * String Concatenation Expressions - https://www.w3.org/TR/xpath-31/#id-string-concat-expr
-   * ========================================================================================
-   */
+  // =====================================================
+  // String Concatenation Expressions -
+  // https://www.w3.org/TR/xpath-31/#id-string-concat-expr
+  // =====================================================
 
   @Override
   protected IExpression handleStringconcatexpr(StringconcatexprContext ctx) {
@@ -643,10 +992,9 @@ protected IExpression handleStringconcatexpr(StringconcatexprContext ctx) {
     });
   }
 
-  /* =======================================================================
-   * Comparison Expressions - https://www.w3.org/TR/xpath-31/#id-comparisons
-   * =======================================================================
-   */
+  // =======================================================================
+  // Comparison Expressions - https://www.w3.org/TR/xpath-31/#id-comparisons
+  // =======================================================================
 
   @Override
   protected IExpression handleComparisonexpr(ComparisonexprContext ctx) { // NOPMD - ok
@@ -719,10 +1067,9 @@ protected IExpression handleComparisonexpr(ComparisonexprContext ctx) { // NOPMD
     return retval;
   }
 
-  /* ============================================================================
-   * Logical Expressions - https://www.w3.org/TR/xpath-31/#id-logical-expressions
-   * ============================================================================
-   */
+  // ============================================================================
+  // Logical Expressions - https://www.w3.org/TR/xpath-31/#id-logical-expressions
+  // ============================================================================
 
   @Override
   protected IExpression handleOrexpr(OrexprContext ctx) {
@@ -740,72 +1087,9 @@ protected IExpression handleAndexpr(AndexprContext ctx) {
     });
   }
 
-  /* ====================================================================
-   * For Expressions - https://www.w3.org/TR/xpath-31/#id-for-expressions
-   * ====================================================================
-   */
-
-  @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
-  @Override
-  protected IExpression handleForexpr(ForexprContext ctx) {
-    SimpleforclauseContext simpleForClause = ctx.simpleforclause();
-
-    // for SimpleForBinding ("," SimpleForBinding)*
-    int bindingCount = simpleForClause.getChildCount() / 2;
-
-    @NonNull IExpression retval = ObjectUtils.notNull(ctx.exprsingle().accept(this));
-
-    // step through in reverse
-    for (int idx = bindingCount - 1; idx >= 0; idx--) {
-      SimpleforbindingContext simpleForBinding = simpleForClause.simpleforbinding(idx);
-
-      VarnameContext varName = simpleForBinding.varname();
-      ExprsingleContext exprSingle = simpleForBinding.exprsingle();
-
-      Name name = (Name) varName.accept(this);
-      IExpression boundExpression = exprSingle.accept(this);
-
-      assert name != null;
-      assert boundExpression != null;
-
-      Let.VariableDeclaration variable = new Let.VariableDeclaration(name, boundExpression);
-
-      retval = new For(variable, retval);
-    }
-    return retval;
-  }
-
-  /* ====================================================================
-   * Let Expressions - https://www.w3.org/TR/xpath-31/#id-let-expressions
-   * ====================================================================
-   */
-
-  @Override
-  protected IExpression handleLet(LetexprContext context) {
-    @NonNull IExpression retval = ObjectUtils.notNull(context.exprsingle().accept(this));
-
-    SimpleletclauseContext letClause = context.simpleletclause();
-    List<SimpleletbindingContext> clauses = letClause.simpleletbinding();
-
-    ListIterator<SimpleletbindingContext> reverseListIterator = clauses.listIterator(clauses.size());
-    while (reverseListIterator.hasPrevious()) {
-      SimpleletbindingContext simpleCtx = reverseListIterator.previous();
-
-      Name varName = (Name) simpleCtx.varname().accept(this);
-      IExpression boundExpression = simpleCtx.exprsingle().accept(this);
-
-      assert varName != null;
-      assert boundExpression != null;
-
-      retval = new Let(varName, boundExpression, retval); // NOPMD intended
-    }
-    return retval;
-  }
-
-  /* =========================================================================
-   * Conditional Expressions - https://www.w3.org/TR/xpath-31/#id-conditionals
-   * =========================================================================
-   */
+  // =========================================================================
+  // Conditional Expressions - https://www.w3.org/TR/xpath-31/#id-conditionals
+  // =========================================================================
 
   @Override
   protected IExpression handleIfexpr(IfexprContext ctx) {
@@ -816,86 +1100,20 @@ protected IExpression handleIfexpr(IfexprContext ctx) {
     return new If(testExpr, thenExpr, elseExpr);
   }
 
-  /* ==================================================================================
-   * Quantified Expressions - https://www.w3.org/TR/xpath-31/#id-quantified-expressions
-   * ==================================================================================
-   */
-
-  @Override
-  protected IExpression handleQuantifiedexpr(QuantifiedexprContext ctx) {
-    Quantified.Quantifier quantifier;
-    int type = ((TerminalNode) ctx.getChild(0)).getSymbol().getType();
-    switch (type) {
-    case Metapath10Lexer.KW_SOME:
-      quantifier = Quantified.Quantifier.SOME;
-      break;
-    case Metapath10Lexer.KW_EVERY:
-      quantifier = Quantified.Quantifier.EVERY;
-      break;
-    default:
-      throw new UnsupportedOperationException(((TerminalNode) ctx.getChild(0)).getSymbol().getText());
-    }
-
-    int numVars = (ctx.getChildCount() - 2) / 5; // children - "satisfies expr" / ", $ varName in expr"
-    Map<String, IExpression> vars = new LinkedHashMap<>(); // NOPMD ordering needed
-    int offset = 0;
-    for (; offset < numVars; offset++) {
-      // $
-      String varName = ((Name) visit(ctx.varname(offset))).getValue();
-      // in
-      IExpression varExpr = visit(ctx.exprsingle(offset));
-
-      vars.put(varName, varExpr);
-    }
-
-    IExpression satisfies = visit(ctx.exprsingle(offset));
-
-    return new Quantified(quantifier, vars, satisfies);
-  }
-
-  /* =========================================================================
-   * Simple map operator (!) - https://www.w3.org/TR/xpath-31/#id-map-operator
-   * =========================================================================
-   */
+  // =========================================================================
+  // Simple map operator (!) - https://www.w3.org/TR/xpath-31/#id-map-operator
+  // =========================================================================
 
   @Override
   protected IExpression handleSimplemapexpr(SimplemapexprContext context) {
     return handleGroupedNAiry(context, 0, 2, (ctx, idx, left) -> {
+      assert left != null;
+
       // the next child is "!"
       assert "!".equals(ctx.getChild(idx).getText());
-      IExpression right = ctx.getChild(idx + 1).accept(this);
+      IExpression right = ObjectUtils.notNull(ctx.getChild(idx + 1).accept(this));
 
       return new SimpleMap(left, right);
     });
   }
-
-  /* =======================================================================
-   * Arrow operator (=>) - https://www.w3.org/TR/xpath-31/#id-arrow-operator
-   * =======================================================================
-   */
-
-  @Override
-  protected IExpression handleArrowexpr(ArrowexprContext context) {
-    // TODO: handle additional syntax for varef and parenthesized
-    return handleGroupedNAiry(context, 0, 3, (ctx, idx, left) -> {
-      // the next child is "=>"
-      assert "=>".equals(ctx.getChild(idx).getText());
-
-      int offset = (idx - 1) / 3;
-
-      ArrowfunctionspecifierContext fcCtx = ctx.getChild(ArrowfunctionspecifierContext.class, offset);
-      ArgumentlistContext argumentCtx = ctx.getChild(ArgumentlistContext.class, offset);
-      // QName name = toQName(
-      String name = fcCtx.eqname().getText();
-      assert name != null;
-
-      try (Stream<IExpression> args = Stream.concat(
-          Stream.of(left),
-          parseArgumentList(ObjectUtils.notNull(argumentCtx)))) {
-        assert args != null;
-
-        return new FunctionCall(name, ObjectUtils.notNull(args.collect(Collectors.toUnmodifiableList())));
-      }
-    });
-  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/CSTPrinter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/CSTPrinter.java
index c5be781ad..9a1168cb1 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/CSTPrinter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/CSTPrinter.java
@@ -35,14 +35,17 @@
 import gov.nist.secauto.metaschema.core.metapath.cst.math.Multiplication;
 import gov.nist.secauto.metaschema.core.metapath.cst.math.Subtraction;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Axis;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.ContextItem;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Flag;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.ModelInstance;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.NameTest;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootDoubleSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashOnlyPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Step;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.Wildcard;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -64,6 +67,7 @@ public static String toString(@NonNull IExpression expr) {
     return new CSTPrinterVisitor().visit(expr);
   }
 
+  @SuppressWarnings("PMD.ExcessivePublicCount")
   private static final class CSTPrinterVisitor
       extends AbstractExpressionVisitor<String, State> {
 
@@ -180,7 +184,7 @@ public String visitFlag(Flag expr, State context) {
     }
 
     @Override
-    public String visitFunctionCall(FunctionCall expr, State context) {
+    public String visitFunctionCall(StaticFunctionCall expr, State context) {
       return appendNode(expr, super.visitFunctionCall(expr, context), context);
     }
 
@@ -220,7 +224,7 @@ public String visitMultiplication(Multiplication expr, State context) {
     }
 
     @Override
-    public String visitName(Name expr, State context) {
+    public String visitName(NameTest expr, State context) {
       return appendNode(expr, super.visitName(expr, context), context);
     }
 
@@ -240,7 +244,7 @@ public String visitAxis(Axis expr, State context) {
     }
 
     @Override
-    public String visitPredicate(Predicate expr, State context) {
+    public String visitPredicate(PredicateExpression expr, State context) {
       return appendNode(expr, super.visitPredicate(expr, context), context);
     }
 
@@ -334,6 +338,40 @@ public String visitSimpleMap(SimpleMap expr, State context) {
       return appendNode(expr, super.visitSimpleMap(expr, context), context);
     }
 
+    @Override
+    public String visitArray(ArraySequenceConstructor expr, State context) {
+      return appendNode(expr, super.visitArray(expr, context), context);
+    }
+
+    @Override
+    public String visitArray(ArraySquareConstructor expr, State context) {
+      return appendNode(expr, super.visitArray(expr, context), context);
+    }
+
+    @Override
+    public String visitPostfixLookup(PostfixLookup expr, State context) {
+      return appendNode(expr, super.visitPostfixLookup(expr, context), context);
+    }
+
+    @Override
+    public String visitFunctionCallAccessor(FunctionCallAccessor expr, State context) {
+      return appendNode(expr, super.visitFunctionCallAccessor(expr, context), context);
+    }
+
+    @Override
+    public String visitUnaryLookup(UnaryLookup expr, State context) {
+      return appendNode(expr, super.visitUnaryLookup(expr, context), context);
+    }
+
+    @Override
+    public String visitMapConstructor(MapConstructor expr, State context) {
+      return appendNode(expr, super.visitMapConstructor(expr, context), context);
+    }
+
+    @Override
+    public String visitMapConstructorEntry(MapConstructor.Entry expr, State context) {
+      return appendNode(expr, super.visitMapConstructorEntry(expr, context), context);
+    }
   }
 
   static class State {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/DecimalLiteral.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/DecimalLiteral.java
index f9e74f3d0..6cfdad1e4 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/DecimalLiteral.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/DecimalLiteral.java
@@ -34,6 +34,12 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * An implementation of the
+ * <a href="https://www.w3.org/TR/xpath-31/#id-literals">Decimal Literal
+ * Expression</a> supporting the creation of a Metapath constant literal
+ * {@link IDecimalItem}.
+ */
 public class DecimalLiteral
     extends AbstractLiteralExpression<IDecimalItem, BigDecimal> {
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Except.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Except.java
index cacef3b31..7ceab5c41 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Except.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Except.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.List;
 
@@ -55,8 +56,8 @@ public Except(@NonNull IExpression left, @NonNull IExpression right) {
 
   @Override
   protected ISequence<?> applyFilterTo(@NonNull ISequence<?> result, @NonNull List<? extends IItem> items) {
-    return ISequence.of(result.asStream()
-        .filter(item -> !items.contains(item)));
+    return ISequence.of(ObjectUtils.notNull(result.stream()
+        .filter(item -> !items.contains(item))));
   }
 
   @Override
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ExpressionUtils.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ExpressionUtils.java
index 5fc6ec69f..d900ed4ae 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ExpressionUtils.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ExpressionUtils.java
@@ -61,7 +61,7 @@ public static <RESULT_TYPE> Class<? extends RESULT_TYPE> analyzeStaticResultType
       retval = baseType;
     } else {
       List<Class<?>> expressionClasses = ObjectUtils.notNull(expressions.stream()
-          .map(expr -> expr.getStaticResultType()).collect(Collectors.toList()));
+          .map(IExpression::getStaticResultType).collect(Collectors.toList()));
 
       // check if the expression classes, are derived from the base type
       if (checkDerivedFrom(baseType, expressionClasses)) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/For.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/For.java
index 41d33a16f..2101bf1ed 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/For.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/For.java
@@ -37,6 +37,11 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * An implementation of the
+ * <a href="https://www.w3.org/TR/xpath-31/#id-for-expressions">For
+ * expression</a> supporting variable-based iteration.
+ */
 @SuppressWarnings("PMD.ShortClassName")
 public class For implements IExpression {
   @NonNull
@@ -44,16 +49,34 @@ public class For implements IExpression {
   @NonNull
   private final IExpression returnExpression;
 
+  /**
+   * Construct a new let expression using the provided variable and return clause.
+   *
+   * @param variable
+   *          the variable declaration
+   * @param returnExpr
+   *          the return clause that makes use of variables for evaluation
+   */
   public For(@NonNull VariableDeclaration variable, @NonNull IExpression returnExpr) {
     this.variable = variable;
     this.returnExpression = returnExpr;
   }
 
+  /**
+   * Get the variable declaration.
+   *
+   * @return the variable declaration expression
+   */
   @NonNull
   protected Let.VariableDeclaration getVariable() {
     return variable;
   }
 
+  /**
+   * Get the return expression.
+   *
+   * @return the return expression
+   */
   @NonNull
   protected IExpression getReturnExpression() {
     return returnExpression;
@@ -79,9 +102,9 @@ public ISequence<? extends IItem> accept(DynamicContext dynamicContext, ISequenc
 
     List<IItem> retval = new LinkedList<>();
     for (IItem item : variableResult) {
-      subDynamicContext.bindVariableValue(variable.getName().getValue(), ISequence.of(item));
+      subDynamicContext.bindVariableValue(variable.getName(), ISequence.of(item));
       retval.addAll(getReturnExpression().accept(subDynamicContext, focus));
     }
-    return ISequence.of(retval);
+    return ISequence.ofCollection(retval);
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/FunctionCallAccessor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/FunctionCallAccessor.java
new file mode 100644
index 000000000..9d16f88cb
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/FunctionCallAccessor.java
@@ -0,0 +1,117 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.cst;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.StaticMetapathException;
+import gov.nist.secauto.metaschema.core.metapath.function.library.ArrayGet;
+import gov.nist.secauto.metaschema.core.metapath.function.library.FnData;
+import gov.nist.secauto.metaschema.core.metapath.function.library.MapGet;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class FunctionCallAccessor implements IExpression {
+  @NonNull
+  private final IExpression base;
+  @NonNull
+  private final IExpression argument;
+
+  /**
+   * Construct a new functional call accessor.
+   *
+   * @param base
+   *          the expression whose result is used as the map or array to perform
+   *          the lookup on
+   * @param keyOrIndex
+   *          the value to find, which will be the key for a map or the index for
+   *          an array
+   */
+  public FunctionCallAccessor(@NonNull IExpression base, @NonNull IExpression keyOrIndex) {
+    this.base = base;
+    this.argument = keyOrIndex;
+  }
+
+  /**
+   * Get the base sub-expression.
+   *
+   * @return the sub-expression
+   */
+  @NonNull
+  public IExpression getBase() {
+    return base;
+  }
+
+  /**
+   * Retrieve the argument to use for the lookup.
+   *
+   * @return the argument
+   */
+  @NonNull
+  public IExpression getArgument() {
+    return argument;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public List<? extends IExpression> getChildren() {
+    return List.of(getBase(), getArgument());
+  }
+
+  @Override
+  public ISequence<? extends IItem> accept(DynamicContext dynamicContext, ISequence<?> focus) {
+    ISequence<?> target = getBase().accept(dynamicContext, focus);
+    IItem collection = target.getFirstItem(true);
+    IAnyAtomicItem key = FnData.fnData(getArgument().accept(dynamicContext, focus)).getFirstItem(false);
+    if (key == null) {
+      throw new StaticMetapathException(StaticMetapathException.NO_FUNCTION_MATCH,
+          "No key provided for functional call lookup");
+    }
+
+    ICollectionValue retval = null;
+    if (collection instanceof IArrayItem) {
+      retval = ArrayGet.get((IArrayItem<?>) collection, IIntegerItem.cast(key));
+    } else if (collection instanceof IMapItem) {
+      retval = MapGet.get((IMapItem<?>) collection, key);
+    }
+
+    return retval == null ? ISequence.empty() : retval.asSequence();
+  }
+
+  @Override
+  public <RESULT, CONTEXT> RESULT accept(@NonNull IExpressionVisitor<RESULT, CONTEXT> visitor, CONTEXT context) {
+    return visitor.visitFunctionCallAccessor(this, context);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/IExpressionVisitor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/IExpressionVisitor.java
index 054fd958b..115179655 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/IExpressionVisitor.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/IExpressionVisitor.java
@@ -35,14 +35,17 @@
 import gov.nist.secauto.metaschema.core.metapath.cst.math.Multiplication;
 import gov.nist.secauto.metaschema.core.metapath.cst.math.Subtraction;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Axis;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.ContextItem;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Flag;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.ModelInstance;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.NameTest;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeDoubleSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RelativeSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootDoubleSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashOnlyPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.RootSlashPath;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Step;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.Wildcard;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -56,6 +59,7 @@
  * @param <CONTEXT>
  *          additional state to pass between nodes visited
  */
+@SuppressWarnings("PMD.ExcessivePublicCount")
 public interface IExpressionVisitor<RESULT, CONTEXT> {
 
   /**
@@ -188,7 +192,7 @@ public interface IExpressionVisitor<RESULT, CONTEXT> {
    *          the processing context
    * @return the visitation result or {@code null} if no result was produced
    */
-  RESULT visitFunctionCall(@NonNull FunctionCall expr, @NonNull CONTEXT context);
+  RESULT visitFunctionCall(@NonNull StaticFunctionCall expr, @NonNull CONTEXT context);
 
   /**
    * Visit the CST node.
@@ -276,7 +280,7 @@ public interface IExpressionVisitor<RESULT, CONTEXT> {
    *          the processing context
    * @return the visitation result or {@code null} if no result was produced
    */
-  RESULT visitName(@NonNull Name expr, @NonNull CONTEXT context);
+  RESULT visitName(@NonNull NameTest expr, @NonNull CONTEXT context);
 
   /**
    * Visit the CST node.
@@ -309,7 +313,7 @@ public interface IExpressionVisitor<RESULT, CONTEXT> {
    *          the processing context
    * @return the visitation result or {@code null} if no result was produced
    */
-  RESULT visitPredicate(@NonNull Predicate expr, @NonNull CONTEXT context);
+  RESULT visitPredicate(@NonNull PredicateExpression expr, @NonNull CONTEXT context);
 
   /**
    * Visit the CST node.
@@ -508,4 +512,81 @@ public interface IExpressionVisitor<RESULT, CONTEXT> {
    * @return the visitation result or {@code null} if no result was produced
    */
   RESULT visitSimpleMap(@NonNull SimpleMap expr, @NonNull CONTEXT context);
+
+  /**
+   * Visit the CST node.
+   *
+   * @param expr
+   *          the CST node to visit
+   * @param context
+   *          the processing context
+   * @return the visitation result or {@code null} if no result was produced
+   */
+  RESULT visitMapConstructor(@NonNull MapConstructor expr, @NonNull CONTEXT context);
+
+  /**
+   * Visit the CST node.
+   *
+   * @param expr
+   *          the CST node to visit
+   * @param context
+   *          the processing context
+   * @return the visitation result or {@code null} if no result was produced
+   */
+  RESULT visitMapConstructorEntry(@NonNull MapConstructor.Entry expr, @NonNull CONTEXT context);
+
+  /**
+   * Visit the CST node.
+   *
+   * @param expr
+   *          the CST node to visit
+   * @param context
+   *          the processing context
+   * @return the visitation result or {@code null} if no result was produced
+   */
+  RESULT visitArray(@NonNull ArraySequenceConstructor expr, @NonNull CONTEXT context);
+
+  /**
+   * Visit the CST node.
+   *
+   * @param expr
+   *          the CST node to visit
+   * @param context
+   *          the processing context
+   * @return the visitation result or {@code null} if no result was produced
+   */
+  RESULT visitArray(@NonNull ArraySquareConstructor expr, @NonNull CONTEXT context);
+
+  /**
+   * Visit the CST node.
+   *
+   * @param expr
+   *          the CST node to visit
+   * @param context
+   *          the processing context
+   * @return the visitation result or {@code null} if no result was produced
+   */
+  RESULT visitPostfixLookup(@NonNull PostfixLookup expr, @NonNull CONTEXT context);
+
+  /**
+   * Visit the CST node.
+   *
+   * @param expr
+   *          the CST node to visit
+   * @param context
+   *          the processing context
+   * @return the visitation result or {@code null} if no result was produced
+   */
+  RESULT visitFunctionCallAccessor(@NonNull FunctionCallAccessor expr, @NonNull CONTEXT context);
+
+  /**
+   * Visit the CST node.
+   *
+   * @param expr
+   *          the CST node to visit
+   * @param context
+   *          the processing context
+   * @return the visitation result or {@code null} if no result was produced
+   */
+  RESULT visitUnaryLookup(@NonNull UnaryLookup expr, @NonNull CONTEXT context);
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/IntegerLiteral.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/IntegerLiteral.java
index 9a86b0119..102a92b08 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/IntegerLiteral.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/IntegerLiteral.java
@@ -34,6 +34,12 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * An implementation of the
+ * <a href="https://www.w3.org/TR/xpath-31/#id-literals">Integer Literal
+ * Expression</a> supporting the creation of a Metapath constant literal
+ * {@link IIntegerItem}.
+ */
 public class IntegerLiteral
     extends AbstractLiteralExpression<IIntegerItem, BigInteger> {
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Intersect.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Intersect.java
index 04999c6de..10dad12a0 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Intersect.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Intersect.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.List;
 
@@ -56,9 +57,9 @@ public Intersect(@NonNull IExpression left, @NonNull IExpression right) {
 
   @Override
   protected ISequence<?> applyFilterTo(@NonNull ISequence<?> result, @NonNull List<? extends IItem> items) {
-    return ISequence.of(result.asStream()
+    return ISequence.of(ObjectUtils.notNull(result.stream()
         .distinct()
-        .filter(items::contains));
+        .filter(items::contains)));
   }
 
   @Override
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Let.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Let.java
index bd7389bb4..393195949 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Let.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Let.java
@@ -33,6 +33,8 @@
 
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -57,7 +59,7 @@ public class Let implements IExpression {
    * @param returnExpression
    *          the inner expression to evaluate with the variable in-scope
    */
-  public Let(@NonNull Name name, @NonNull IExpression boundExpression, @NonNull IExpression returnExpression) {
+  public Let(@NonNull QName name, @NonNull IExpression boundExpression, @NonNull IExpression returnExpression) {
     this.variable = new VariableDeclaration(name, boundExpression);
     this.returnExpression = returnExpression;
   }
@@ -102,13 +104,25 @@ public ISequence<? extends IItem> accept(DynamicContext dynamicContext, ISequenc
     return getReturnExpression().accept(subDynamicContext, focus);
   }
 
+  /**
+   * A Metapath expression that binds a variable name to an expresssion.
+   */
   public static class VariableDeclaration {
     @NonNull
-    private final Name name;
+    private final QName name;
     @NonNull
     private final IExpression boundExpression;
 
-    public VariableDeclaration(@NonNull Name name, @NonNull IExpression boundExpression) {
+    /**
+     * Construct a new variable declaration, binding the provided variable name to
+     * the bound expression.
+     *
+     * @param name
+     *          trhe variable name
+     * @param boundExpression
+     *          the bound expression
+     */
+    public VariableDeclaration(@NonNull QName name, @NonNull IExpression boundExpression) {
       this.name = name;
       this.boundExpression = boundExpression;
     }
@@ -119,7 +133,7 @@ public VariableDeclaration(@NonNull Name name, @NonNull IExpression boundExpress
      * @return the variable name
      */
     @NonNull
-    public Name getName() {
+    public QName getName() {
       return name;
     }
 
@@ -133,15 +147,27 @@ public IExpression getBoundExpression() {
       return boundExpression;
     }
 
+    /**
+     * Bind the variable name to the evaluation result of the bound expression.
+     *
+     * @param evaluationDynamicContext
+     *          the {@link DynamicContext} used to evaluate the bound expression
+     * @param focus
+     *          the evaluation focus to use to evaluate the bound expression
+     * @param boundDynamicContext
+     *          the {@link DynamicContext} the variable is bound to
+     */
     public void bind(
-        @NonNull DynamicContext evalContext,
+        @NonNull DynamicContext evaluationDynamicContext,
         @NonNull ISequence<?> focus,
-        @NonNull DynamicContext boundContext) {
+        @NonNull DynamicContext boundDynamicContext) {
+
+      ISequence<?> result = getBoundExpression().accept(evaluationDynamicContext, focus);
 
-      ISequence<?> result = getBoundExpression().accept(evalContext, focus);
+      // ensure this sequence is list backed
+      result.getValue();
 
-      String name = getName().getValue();
-      boundContext.bindVariableValue(name, result);
+      boundDynamicContext.bindVariableValue(getName(), result);
     }
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/MapConstructor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/MapConstructor.java
new file mode 100644
index 000000000..65f98f8d9
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/MapConstructor.java
@@ -0,0 +1,154 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.cst;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.InvalidTypeMetapathException;
+import gov.nist.secauto.metaschema.core.metapath.function.library.FnData;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * An implementation of the
+ * <a href="https://www.w3.org/TR/xpath-31/#id-map-constructors">Map
+ * Constructor</a> supporting the creation of a Metapath {@link IMapItem}.
+ */
+public class MapConstructor implements IExpression {
+  @NonNull
+  private final List<MapConstructor.Entry> entries;
+
+  /**
+   * Construct a new map constructor expression that uses the provided entry
+   * expressions to initialize the map entries.
+   *
+   * @param entries
+   *          the expressions used to produce the map entries
+   */
+  public MapConstructor(@NonNull List<MapConstructor.Entry> entries) {
+    this.entries = entries;
+  }
+
+  @Override
+  public List<MapConstructor.Entry> getChildren() {
+    return entries;
+  }
+
+  @Override
+  public ISequence<? extends IItem> accept(DynamicContext dynamicContext, ISequence<?> focus) {
+    return IMapItem.ofCollection(
+        ObjectUtils.notNull(getChildren().stream()
+            .map(item -> {
+              IExpression keyExpression = item.getKeyExpression();
+              IAnyAtomicItem key = FnData.fnData(keyExpression.accept(dynamicContext, focus))
+                  .getFirstItem(true);
+              if (key == null) {
+                throw new InvalidTypeMetapathException(null, String.format(
+                    "The expression '%s' did not result in a single key atomic value.", keyExpression.toASTString()));
+              }
+              ICollectionValue value = item.getValueExpression().accept(dynamicContext, focus).toCollectionValue();
+
+              return IMapItem.entry(key, value);
+            }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))))
+        .asSequence();
+  }
+
+  @Override
+  public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visitor, CONTEXT context) {
+    return visitor.visitMapConstructor(this, context);
+  }
+
+  /**
+   * A map entry expression used to produce an entry in a {@link IMapItem}.
+   */
+  public static class Entry implements IExpression {
+    @NonNull
+    private final IExpression keyExpression;
+    @NonNull
+    private final IExpression valueExpression;
+
+    /**
+     * Construct a new map entry expression using the provided ket and value
+     * expressions.
+     *
+     * @param keyExpression
+     *          the expression used to get the map entry key
+     * @param valueExpression
+     *          the expression used to get the map entry value
+     */
+    public Entry(@NonNull IExpression keyExpression, @NonNull IExpression valueExpression) {
+      this.keyExpression = keyExpression;
+      this.valueExpression = valueExpression;
+    }
+
+    /**
+     * Get the map entry key expression.
+     *
+     * @return the key expression
+     */
+    @NonNull
+    public IExpression getKeyExpression() {
+      return keyExpression;
+    }
+
+    /**
+     * Get the map entry value expression.
+     *
+     * @return the value expression
+     */
+    @NonNull
+    public IExpression getValueExpression() {
+      return valueExpression;
+    }
+
+    @SuppressWarnings("null")
+    @Override
+    public List<? extends IExpression> getChildren() {
+      return List.of(keyExpression, valueExpression);
+    }
+
+    @Override
+    public ISequence<? extends IItem> accept(DynamicContext dynamicContext, ISequence<?> focus) {
+      throw new UnsupportedOperationException("handled by the map constructor");
+    }
+
+    @Override
+    public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visitor, CONTEXT context) {
+      return visitor.visitMapConstructorEntry(this, context);
+    }
+
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Metapath.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Metapath.java
index 8abb5a942..f77150838 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Metapath.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Metapath.java
@@ -68,7 +68,7 @@ public ISequence<?> accept(DynamicContext dynamicContext, ISequence<?> focus) {
     Stream<? extends IItem> retval = ObjectUtils.notNull(getChildren().stream()
         .flatMap(child -> {
           ISequence<?> result = child.accept(dynamicContext, focus);
-          return result.asStream();
+          return result.stream();
         }));
     return ISequence.of(retval);
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/PostfixLookup.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/PostfixLookup.java
new file mode 100644
index 000000000..259ab0612
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/PostfixLookup.java
@@ -0,0 +1,104 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.cst;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IKeySpecifier;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * An implementation of
+ * <a href="https://www.w3.org/TR/xpath-31/#id-postfix-lookup">Postfix Lookup
+ * Operators</a> supporting access to items in Metapath maps and arrays.
+ * <p>
+ * Provides support for various types of key- and index-based lookups related to
+ * {@link IMapItem} and {@link IArrayItem} objects.
+ */
+public class PostfixLookup
+    extends AbstractLookup {
+
+  @NonNull
+  private final IExpression base;
+
+  /**
+   * Construct a new postfix lookup expression that uses the provided key
+   * specifier.
+   *
+   * @param base
+   *          the base expression used to get the target of the lookup
+   * @param keySpecifier
+   *          the key specifier used to determine matching entries
+   */
+  public PostfixLookup(@NonNull IExpression base, @NonNull IKeySpecifier keySpecifier) {
+    super(keySpecifier);
+    this.base = base;
+  }
+
+  /**
+   * Get the base sub-expression.
+   *
+   * @return the sub-expression
+   */
+  @NonNull
+  public IExpression getBase() {
+    return base;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public List<? extends IExpression> getChildren() {
+    return List.of(getBase());
+  }
+
+  @Override
+  public ISequence<? extends IItem> accept(DynamicContext dynamicContext, ISequence<?> focus) {
+    ISequence<?> base = getBase().accept(dynamicContext, focus);
+
+    IKeySpecifier specifier = getKeySpecifier();
+
+    return ISequence.of(ObjectUtils.notNull(base.stream()
+        .flatMap(item -> {
+          assert item != null;
+          return specifier.lookup(item, dynamicContext, focus);
+        })
+        .flatMap(ICollectionValue::normalizeAsItems)));
+  }
+
+  @Override
+  public <RESULT, CONTEXT> RESULT accept(@NonNull IExpressionVisitor<RESULT, CONTEXT> visitor, CONTEXT context) {
+    return visitor.visitPostfixLookup(this, context);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Predicate.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/PredicateExpression.java
similarity index 95%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Predicate.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/PredicateExpression.java
index 7881452e7..cca0a474c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Predicate.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/PredicateExpression.java
@@ -36,13 +36,14 @@
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public class Predicate implements IExpression {
+public class PredicateExpression implements IExpression {
   @NonNull
   private final IExpression base;
   @NonNull
@@ -56,7 +57,7 @@ public class Predicate implements IExpression {
    * @param predicates
    *          the expression(s) to apply as a filter
    */
-  public Predicate(@NonNull IExpression base, @NonNull List<IExpression> predicates) {
+  public PredicateExpression(@NonNull IExpression base, @NonNull List<IExpression> predicates) {
     this.base = base;
     this.predicates = predicates;
   }
@@ -98,7 +99,7 @@ public List<? extends IExpression> getChildren() {
       AtomicInteger index = new AtomicInteger();
 
       Stream<? extends IItem> stream = ObjectUtils.notNull(
-          retval.asStream().map(item -> {
+          retval.stream().map(item -> {
             // build a positional index of the items
             return Map.entry(BigInteger.valueOf(index.incrementAndGet()), item);
           }).filter(entry -> {
@@ -125,7 +126,7 @@ public List<? extends IExpression> getChildren() {
                   }
                   return bool;
                 }).anyMatch(x -> !x);
-          }).map(entry -> entry.getValue()));
+          }).map(Entry::getValue));
 
       retval = ISequence.of(stream);
     }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Quantified.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Quantified.java
index 04093a970..8a414cee0 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Quantified.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Quantified.java
@@ -44,6 +44,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class Quantified
@@ -56,7 +58,7 @@ public enum Quantifier {
   @NonNull
   private final Quantifier quantifier;
   @NonNull
-  private final Map<String, IExpression> inClauses;
+  private final Map<QName, IExpression> inClauses;
   @NonNull
   private final IExpression satisfies;
 
@@ -74,7 +76,7 @@ public enum Quantifier {
    */
   public Quantified(
       @NonNull Quantifier quantifier,
-      @NonNull Map<String, IExpression> inClauses,
+      @NonNull Map<QName, IExpression> inClauses,
       @NonNull IExpression satisfies) {
     this.quantifier = quantifier;
     this.inClauses = inClauses;
@@ -98,7 +100,7 @@ public Quantifier getQuantifier() {
    * @return the variable names mapped to the associated Metapath expression
    */
   @NonNull
-  public Map<String, IExpression> getInClauses() {
+  public Map<QName, IExpression> getInClauses() {
     return inClauses;
   }
 
@@ -122,20 +124,20 @@ public List<? extends IExpression> getChildren() {
   @SuppressWarnings("PMD.SystemPrintln")
   @Override
   public ISequence<? extends IItem> accept(DynamicContext dynamicContext, ISequence<?> focus) {
-    Map<String, ISequence<? extends IItem>> clauses = getInClauses().entrySet().stream()
+    Map<QName, ISequence<? extends IItem>> clauses = getInClauses().entrySet().stream()
         .map(entry -> Map.entry(
             entry.getKey(),
             entry.getValue().accept(dynamicContext, focus)))
         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 
-    List<String> clauseKeys = new ArrayList<>(clauses.keySet());
+    List<QName> clauseKeys = new ArrayList<>(clauses.keySet());
     List<? extends Collection<? extends IItem>> clauseValues = new ArrayList<>(clauses.values());
 
     boolean retval = true;
     for (List<IItem> product : new CartesianProduct<>(clauseValues)) {
       DynamicContext subDynamicContext = dynamicContext.subContext();
       for (int idx = 0; idx < product.size(); idx++) {
-        String var = clauseKeys.get(idx);
+        QName var = clauseKeys.get(idx);
         IItem item = product.get(idx);
 
         assert var != null;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Range.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Range.java
index a0914210e..f89d13286 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Range.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Range.java
@@ -84,7 +84,7 @@ public ISequence<IIntegerItem> accept(DynamicContext dynamicContext, ISequence<?
         range.add(IIntegerItem.valueOf(val));
       }
 
-      retval = ISequence.of(range);
+      retval = ISequence.ofCollection(range);
     }
     return retval;
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/SimpleMap.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/SimpleMap.java
index e05abd3a8..2c83af005 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/SimpleMap.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/SimpleMap.java
@@ -32,9 +32,23 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * An implementation of the
+ * <a href="https://www.w3.org/TR/xpath-31/#id-map-operator">Simple Map Operator
+ * <code>!</code></a> supporting evaluating a right expression against every
+ * item in a sequence produced by a left expression.
+ */
 public class SimpleMap
     extends AbstractBinaryExpression<IExpression, IExpression> {
 
+  /**
+   * Construct a simple map expression.
+   *
+   * @param left
+   *          the expression used to generate the right sequence
+   * @param right
+   *          the expression used to evaluate each item in the right sequence
+   */
   public SimpleMap(@NonNull IExpression left, @NonNull IExpression right) {
     super(left, right);
   }
@@ -45,7 +59,7 @@ public ISequence<?> accept(DynamicContext dynamicContext, ISequence<?> focus) {
 
     IExpression right = getRight();
     return ObjectUtils.notNull(leftResult.stream()
-        .flatMap(item -> right.accept(dynamicContext, ISequence.of(item)).asStream())
+        .flatMap(item -> right.accept(dynamicContext, ISequence.of(item)).stream())
         .collect(ISequence.toSequence()));
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/FunctionCall.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StaticFunctionCall.java
similarity index 95%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/FunctionCall.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StaticFunctionCall.java
index dbdcf6ea9..9660aeaa3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/FunctionCall.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StaticFunctionCall.java
@@ -38,11 +38,13 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public class FunctionCall implements IExpression {
+public class StaticFunctionCall implements IExpression {
   @NonNull
-  private final String name;
+  private final QName name;
   @NonNull
   private final List<IExpression> arguments;
   private IFunction function;
@@ -55,7 +57,7 @@ public class FunctionCall implements IExpression {
    * @param arguments
    *          the expressions used to provide arguments to the function call
    */
-  public FunctionCall(@NonNull String name, @NonNull List<IExpression> arguments) {
+  public StaticFunctionCall(@NonNull QName name, @NonNull List<IExpression> arguments) {
     this.name = Objects.requireNonNull(name, "name");
     this.arguments = Objects.requireNonNull(arguments, "arguments");
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StringConcat.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StringConcat.java
index 2f7c36f27..757163ee9 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StringConcat.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StringConcat.java
@@ -71,7 +71,7 @@ public ISequence<?> accept(DynamicContext dynamicContext, ISequence<?> focus) {
     StringBuilder builder = new StringBuilder();
     for (IExpression child : getChildren()) {
       ISequence<?> result = child.accept(dynamicContext, focus);
-      FnData.fnData(result).asStream()
+      FnData.fnData(result).stream()
           .forEachOrdered(item -> {
             builder.append(item.asString());
           });
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StringLiteral.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StringLiteral.java
index 5d0fbaabe..9ada58e64 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StringLiteral.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/StringLiteral.java
@@ -35,6 +35,12 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * An implementation of the
+ * <a href="https://www.w3.org/TR/xpath-31/#id-literals">String Literal
+ * Expression</a> supporting the creation of a Metapath constant literal
+ * {@link IStringItem}.
+ */
 public class StringLiteral
     extends AbstractLiteralExpression<IStringItem, String> {
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/UnaryLookup.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/UnaryLookup.java
new file mode 100644
index 000000000..5378aa65f
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/UnaryLookup.java
@@ -0,0 +1,84 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.cst;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IKeySpecifier;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * An implementation of
+ * <a href="https://www.w3.org/TR/xpath-31/#id-unary-lookup">Unary Lookup
+ * Operators</a> supporting access to items in Metapath maps and arrays.
+ * <p>
+ * Provides support for various types of key- and index-based lookups related to
+ * {@link IMapItem} and {@link IArrayItem} objects.
+ */
+public class UnaryLookup
+    extends AbstractLookup {
+  /**
+   * Construct a new unary lookup expression that uses the provided key specifier.
+   *
+   * @param keySpecifier
+   *          the key specifier used to determine matching entries
+   */
+  public UnaryLookup(@NonNull IKeySpecifier keySpecifier) {
+    super(keySpecifier);
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public List<? extends IExpression> getChildren() {
+    return List.of();
+  }
+
+  @Override
+  public ISequence<? extends IItem> accept(DynamicContext dynamicContext, ISequence<?> focus) {
+    IKeySpecifier specifier = getKeySpecifier();
+
+    return ISequence.of(ObjectUtils.notNull(focus.stream()
+        .flatMap(item -> {
+          assert item != null;
+          return specifier.lookup(item, dynamicContext, focus);
+        })
+        .flatMap(ICollectionValue::normalizeAsItems)));
+  }
+
+  @Override
+  public <RESULT, CONTEXT> RESULT accept(@NonNull IExpressionVisitor<RESULT, CONTEXT> visitor, CONTEXT context) {
+    return visitor.visitUnaryLookup(this, context);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Union.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Union.java
index 7eaacd691..ab8be293f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Union.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Union.java
@@ -70,11 +70,14 @@ public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visit
 
   @Override
   public ISequence<?> accept(DynamicContext dynamicContext, ISequence<?> focus) {
-    focus.collect();
+    // ensure the sequence is backed by a list
+    focus.getValue();
+
+    // now process the union
     @NonNull Stream<? extends IItem> retval = ObjectUtils.notNull(getChildren().stream()
         .flatMap(child -> {
           ISequence<?> result = child.accept(dynamicContext, focus);
-          return result.asStream();
+          return result.stream();
         }).distinct());
     return ISequence.of(retval);
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/VariableReference.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/VariableReference.java
index 9cd5beb7e..959861c84 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/VariableReference.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/VariableReference.java
@@ -34,6 +34,8 @@
 
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -43,7 +45,7 @@
  */
 public class VariableReference implements IExpression {
   @NonNull
-  private final Name name;
+  private final QName name;
 
   /**
    * Construct a new Metapath variable reference CST node.
@@ -51,7 +53,7 @@ public class VariableReference implements IExpression {
    * @param name
    *          the variable name
    */
-  public VariableReference(@NonNull Name name) {
+  public VariableReference(@NonNull QName name) {
     this.name = name;
   }
 
@@ -61,7 +63,7 @@ public VariableReference(@NonNull Name name) {
    * @return the variable name
    */
   @NonNull
-  public Name getName() {
+  public QName getName() {
     return name;
   }
 
@@ -73,7 +75,7 @@ public List<? extends IExpression> getChildren() {
   @SuppressWarnings("null")
   @Override
   public String toASTString() {
-    return String.format("%s[name=%s]", getClass().getName(), getName().getValue());
+    return String.format("%s[name=%s]", getClass().getName(), getName());
   }
 
   @Override
@@ -83,7 +85,7 @@ public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visit
 
   @Override
   public ISequence<? extends IItem> accept(DynamicContext dynamicContext, ISequence<?> focus) {
-    return dynamicContext.getVariableValue(ObjectUtils.notNull(getName().getValue()));
+    return dynamicContext.getVariableValue(ObjectUtils.notNull(getName()));
   }
 
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractPathExpression.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractPathExpression.java
index 410e900f0..9f58eeaaa 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractPathExpression.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/AbstractPathExpression.java
@@ -35,6 +35,7 @@
 import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils;
 import gov.nist.secauto.metaschema.core.metapath.item.node.ICycledAssemblyNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.stream.Stream;
 
@@ -68,15 +69,15 @@ protected Stream<? extends INodeItem> searchExpression(
       @NonNull IExpression expression,
       @NonNull DynamicContext dynamicContext,
       @NonNull ISequence<?> outerFocus) {
-
-    outerFocus.collect();
+    // ensure the sequence is backed by a list
+    outerFocus.getValue();
 
     // check the current focus
     @SuppressWarnings("unchecked") Stream<? extends INodeItem> nodeMatches
-        = (Stream<? extends INodeItem>) expression.accept(dynamicContext, outerFocus).asStream();
+        = (Stream<? extends INodeItem>) expression.accept(dynamicContext, outerFocus).stream();
 
-    Stream<? extends INodeItem> childMatches = outerFocus.asStream()
-        .map(item -> ItemUtils.checkItemIsNodeItemForStep(item))
+    Stream<? extends INodeItem> childMatches = outerFocus.stream()
+        .map(ItemUtils::checkItemIsNodeItemForStep)
         .flatMap(focusedNode -> {
 
           Stream<? extends INodeItem> matches;
@@ -92,7 +93,7 @@ protected Stream<? extends INodeItem> searchExpression(
             matches = searchExpression(
                 expression,
                 dynamicContext,
-                ISequence.of(Stream.concat(flags, modelItems)));
+                ISequence.of(ObjectUtils.notNull(Stream.concat(flags, modelItems))));
           }
           return matches;
         });
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Axis.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Axis.java
index 1895941a9..dd1340d87 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Axis.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Axis.java
@@ -43,7 +43,7 @@
 
 @SuppressWarnings("PMD.ShortClassName") // intentional
 public enum Axis implements IExpression {
-  SELF(focus -> Stream.of(focus)),
+  SELF(Stream::of),
   PARENT(focus -> Stream.ofNullable(focus.getParentNodeItem())),
   ANCESTOR(INodeItem::ancestor),
   ANCESTOR_OR_SELF(INodeItem::ancestorOrSelf),
@@ -98,12 +98,12 @@ public ISequence<? extends INodeItem> accept(
     if (outerFocus.isEmpty()) {
       retval = ISequence.empty();
     } else {
-      retval = ISequence.of(outerFocus.asStream()
-          .map(item -> ItemUtils.checkItemIsNodeItemForStep(item))
+      retval = ISequence.of(ObjectUtils.notNull(outerFocus.stream()
+          .map(ItemUtils::checkItemIsNodeItemForStep)
           .flatMap(item -> {
             assert item != null;
             return execute(item);
-          }).distinct());
+          }).distinct()));
     }
     return retval;
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ContextItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ContextItem.java
similarity index 89%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ContextItem.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ContextItem.java
index 79ec54571..beb9169bf 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/ContextItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ContextItem.java
@@ -24,12 +24,13 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.metapath.cst;
+package gov.nist.secauto.metaschema.core.metapath.cst.path;
 
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.DynamicMetapathException;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
-import gov.nist.secauto.metaschema.core.metapath.cst.path.AbstractPathExpression;
+import gov.nist.secauto.metaschema.core.metapath.cst.IExpression;
+import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 
 import java.util.Collections;
@@ -37,6 +38,12 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * An implementation of the
+ * <a href="https://www.w3.org/TR/xpath-31/#id-context-item-expression">Context
+ * Item Expression</a> based on the current focus of the Metapath
+ * {@link DynamicContext}.
+ */
 public final class ContextItem
     extends AbstractPathExpression<INodeItem> {
   @NonNull
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Flag.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Flag.java
index 60d9e2a46..0a959feac 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Flag.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Flag.java
@@ -31,13 +31,15 @@
 import gov.nist.secauto.metaschema.core.metapath.cst.AbstractNamedInstanceExpression;
 import gov.nist.secauto.metaschema.core.metapath.cst.IExpression;
 import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor;
-import gov.nist.secauto.metaschema.core.metapath.cst.Name;
 import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class Flag // NOPMD - intentional name
@@ -68,12 +70,12 @@ public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visit
   public ISequence<? extends IFlagNodeItem> accept(
       DynamicContext dynamicContext,
       ISequence<?> focus) {
-    return ISequence.of(focus.asStream()
-        .map(item -> ItemUtils.checkItemIsNodeItemForStep(item))
+    return ISequence.of(ObjectUtils.notNull(focus.stream()
+        .map(ItemUtils::checkItemIsNodeItemForStep)
         .flatMap(item -> {
           assert item != null;
           return match(item);
-        }));
+        })));
   }
 
   /**
@@ -87,8 +89,8 @@ public ISequence<? extends IFlagNodeItem> accept(
   @NonNull
   protected Stream<? extends IFlagNodeItem> match(@NonNull INodeItem focusedItem) {
     Stream<? extends IFlagNodeItem> retval;
-    if (getTest() instanceof Name) {
-      String name = ((Name) getTest()).getValue();
+    if (getTest() instanceof NameTest) {
+      QName name = ((NameTest) getTest()).getName();
 
       IFlagNodeItem item = focusedItem.getFlagByName(name);
       retval = item == null ? Stream.empty() : Stream.of(item);
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingContainerModelAssembly.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/INameTestExpression.java
similarity index 75%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingContainerModelAssembly.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/INameTestExpression.java
index 47f9d2144..992a5211e 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingContainerModelAssembly.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/INameTestExpression.java
@@ -24,21 +24,28 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema;
+package gov.nist.secauto.metaschema.core.metapath.cst.path;
 
-import gov.nist.secauto.metaschema.core.model.IContainerModelAssembly;
+import gov.nist.secauto.metaschema.core.metapath.cst.IExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 
+import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-
-public interface IBindingContainerModelAssembly extends IContainerModelAssembly, IBindingContainerModelAbsolute {
 
+public interface INameTestExpression extends INodeTestExpression {
+  @SuppressWarnings("null")
   @Override
-  List<? extends IInstanceModelChoiceBinding> getChoiceInstances();
+  default List<? extends IExpression> getChildren() {
+    return Collections.emptyList();
+  }
 
   @Override
-  IInstanceModelChoiceGroupBinding getChoiceGroupInstanceByName(String name);
+  default Class<INodeItem> getBaseResultType() {
+    return INodeItem.class;
+  }
 
   @Override
-  Map<String, ? extends IInstanceModelChoiceGroupBinding> getChoiceGroupInstances();
+  default Class<INodeItem> getStaticResultType() {
+    return getBaseResultType();
+  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceFlag.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/INodeTestExpression.java
similarity index 89%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceFlag.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/INodeTestExpression.java
index 6c127ea7b..b5bd5bed1 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceFlag.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/INodeTestExpression.java
@@ -24,10 +24,10 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema;
+package gov.nist.secauto.metaschema.core.metapath.cst.path;
 
-import gov.nist.secauto.metaschema.core.model.IFlagInstance;
+import gov.nist.secauto.metaschema.core.metapath.cst.IExpression;
 
-public interface IBindingInstanceFlag extends IFlagInstance, IBindingInstance {
+public interface INodeTestExpression extends IExpression {
   // no additional methods
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ModelInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ModelInstance.java
index f63c0a7f6..9b63f740d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ModelInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/ModelInstance.java
@@ -31,14 +31,16 @@
 import gov.nist.secauto.metaschema.core.metapath.cst.AbstractNamedInstanceExpression;
 import gov.nist.secauto.metaschema.core.metapath.cst.IExpression;
 import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor;
-import gov.nist.secauto.metaschema.core.metapath.cst.Name;
 import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.List;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 @SuppressWarnings("rawtypes")
@@ -70,12 +72,12 @@ public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visit
   public ISequence<? extends IModelNodeItem<?, ?>> accept(
       DynamicContext dynamicContext,
       ISequence<?> focus) {
-    return ISequence.of(focus.asStream()
-        .map(item -> ItemUtils.checkItemIsNodeItemForStep(item))
+    return ISequence.of(ObjectUtils.notNull(focus.stream()
+        .map(ItemUtils::checkItemIsNodeItemForStep)
         .flatMap(item -> {
           assert item != null;
           return match(item);
-        }));
+        })));
   }
 
   /**
@@ -90,8 +92,8 @@ public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visit
   protected Stream<? extends IModelNodeItem<?, ?>> match(
       @NonNull INodeItem focusedItem) {
     Stream<? extends IModelNodeItem<?, ?>> retval;
-    if (getTest() instanceof Name) {
-      String name = ((Name) getTest()).getValue();
+    if (getTest() instanceof NameTest) {
+      QName name = ((NameTest) getTest()).getName();
       List<? extends IModelNodeItem<?, ?>> items = focusedItem.getModelItemsByName(name);
       retval = items.stream();
     } else {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Name.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/NameTest.java
similarity index 76%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Name.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/NameTest.java
index 2760a5849..b4f52d3a7 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/Name.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/NameTest.java
@@ -24,16 +24,17 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.metapath.cst;
+package gov.nist.secauto.metaschema.core.metapath.cst.path;
 
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor;
 import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
-import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
-import java.util.List;
+import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -42,20 +43,21 @@
  * <a href="https://www.w3.org/TR/xpath-31/#dt-expanded-qname">expanded QName
  * name test</a>.
  */
-public class Name // NOPMD - intentional
-    implements IExpression {
+@SuppressWarnings("PMD.TestClassWithoutTestCases")
+public class NameTest
+    implements INameTestExpression {
 
   @NonNull
-  private final String value;
+  private final QName name;
 
   /**
    * Construct a new expanded QName-based literal expression.
    *
-   * @param value
+   * @param name
    *          the literal value
    */
-  public Name(@NonNull String value) {
-    this.value = value;
+  public NameTest(@NonNull QName name) {
+    this.name = name;
   }
 
   /**
@@ -64,23 +66,8 @@ public Name(@NonNull String value) {
    * @return the string value of the name
    */
   @NonNull
-  public String getValue() {
-    return value;
-  }
-
-  @Override
-  public List<IExpression> getChildren() {
-    return CollectionUtil.emptyList();
-  }
-
-  @Override
-  public Class<INodeItem> getBaseResultType() {
-    return INodeItem.class;
-  }
-
-  @Override
-  public Class<INodeItem> getStaticResultType() {
-    return getBaseResultType();
+  public QName getName() {
+    return name;
   }
 
   @Override
@@ -92,20 +79,20 @@ public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visit
   public ISequence<? extends INodeItem> accept(
       DynamicContext dynamicContext,
       ISequence<?> focus) {
-    return ISequence.of(focus.asStream()
-        .map(item -> ItemUtils.checkItemIsNodeItemForStep(item))
-        .filter(this::match));
+    return ISequence.of(ObjectUtils.notNull(focus.stream()
+        .map(ItemUtils::checkItemIsNodeItemForStep)
+        .filter(this::match)));
   }
 
   @SuppressWarnings("PMD.UnusedPrivateMethod")
   private boolean match(INodeItem item) {
     return item instanceof IDefinitionNodeItem
-        && getValue().equals(((IDefinitionNodeItem<?, ?>) item).getName());
+        && getName().equals(((IDefinitionNodeItem<?, ?>) item).getName());
   }
 
   @SuppressWarnings("null")
   @Override
   public String toASTString() {
-    return String.format("%s[value=%s]", getClass().getName(), getValue());
+    return String.format("%s[name=%s]", getClass().getName(), getName());
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RelativeSlashPath.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RelativeSlashPath.java
index f65b0ba61..1b52e18a4 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RelativeSlashPath.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RelativeSlashPath.java
@@ -60,6 +60,9 @@ public ISequence<?> accept(
       ISequence<?> focus) {
     ISequence<?> leftResult = getLeft().accept(dynamicContext, focus);
 
+    // ensure the left sequence is list backed
+    leftResult.getValue();
+
     return getRight().accept(dynamicContext, leftResult);
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java
index c5e5902ea..aa0d0688e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java
@@ -60,8 +60,8 @@ public ISequence<? extends INodeItem> accept(
       DynamicContext dynamicContext,
       ISequence<?> focus) {
 
-    return ObjectUtils.notNull(focus.asStream()
-        .map(item -> ItemUtils.checkItemIsNodeItemForStep(item))
+    return ObjectUtils.notNull(focus.stream()
+        .map(ItemUtils::checkItemIsNodeItemForStep)
         .map(item -> Axis.ANCESTOR_OR_SELF.execute(ObjectUtils.notNull(item)).findFirst().get())
         .collect(ISequence.toSequence()));
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashPath.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashPath.java
index c33b16189..4d0cec884 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashPath.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/RootSlashPath.java
@@ -59,9 +59,10 @@ public ISequence<?> accept(
       DynamicContext dynamicContext,
       ISequence<?> focus) {
 
-    ISequence<?> roots = ObjectUtils.notNull(focus.asStream()
-        .map(item -> ItemUtils.checkItemIsNodeItemForStep(item))
-        .map(item -> Axis.ANCESTOR_OR_SELF.execute(ObjectUtils.notNull(item)).findFirst().get())
+    ISequence<?> roots = ObjectUtils.notNull(focus.stream()
+        .map(ItemUtils::checkItemIsNodeItemForStep)
+        // the previous checks for a null instance
+        .flatMap(item -> Axis.ANCESTOR_OR_SELF.execute(ObjectUtils.notNull(item)).limit(1))
         .collect(ISequence.toSequence()));
 
     return getExpression().accept(dynamicContext, roots);
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Step.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Step.java
index 41178b2ae..5e398af78 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Step.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Step.java
@@ -49,7 +49,7 @@ public class Step implements IExpression { // NOPMD - intentional
   @NonNull
   private final Axis axisExpression;
   @NonNull
-  private final IExpression stepExpression;
+  private final INodeTestExpression stepExpression;
   @NonNull
   private final Class<? extends IItem> staticResultType;
 
@@ -62,7 +62,7 @@ public class Step implements IExpression { // NOPMD - intentional
    *          the sub-expression to evaluate before filtering with the predicates
    */
   @SuppressWarnings("null")
-  public Step(@NonNull Axis axis, @NonNull IExpression step) {
+  public Step(@NonNull Axis axis, @NonNull INodeTestExpression step) {
     this.axisExpression = axis;
     this.stepExpression = step;
     this.staticResultType = ExpressionUtils.analyzeStaticResultType(IItem.class, List.of(step));
@@ -84,7 +84,7 @@ public Axis getAxis() {
    * @return the sub-expression
    */
   @NonNull
-  public IExpression getStep() {
+  public INodeTestExpression getStep() {
     return stepExpression;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Wildcard.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Wildcard.java
new file mode 100644
index 000000000..ba666d16f
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/path/Wildcard.java
@@ -0,0 +1,127 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.cst.path;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.cst.IExpressionVisitor;
+import gov.nist.secauto.metaschema.core.metapath.item.ItemUtils;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem;
+import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+/**
+ * The CST node for a Metapath
+ * <a href="https://www.w3.org/TR/xpath-31/#doc-xpath31-Wildcard">wildcard name
+ * test</a>.
+ */
+public class Wildcard implements INameTestExpression {
+  @Nullable
+  private final Predicate<IDefinitionNodeItem<?, ?>> matcher;
+
+  /**
+   * Construct a new wildcard name test expression using the provided matcher.
+   *
+   * @param matcher
+   *          the matcher used to determine matching nodes
+   */
+  public Wildcard(@Nullable Predicate<IDefinitionNodeItem<?, ?>> matcher) {
+    this.matcher = matcher;
+  }
+
+  @Override
+  public <RESULT, CONTEXT> RESULT accept(IExpressionVisitor<RESULT, CONTEXT> visitor, CONTEXT context) {
+    return visitor.visitWildcard(this, context);
+  }
+
+  @Override
+  public ISequence<? extends INodeItem> accept(
+      DynamicContext dynamicContext, ISequence<?> focus) {
+    Stream<? extends INodeItem> nodes = focus.stream().map(ItemUtils::checkItemIsNodeItemForStep);
+    if (matcher != null) {
+      Predicate<IDefinitionNodeItem<?, ?>> test = matcher;
+      nodes = nodes.filter(item -> {
+        assert matcher != null;
+        return !(item instanceof IDefinitionNodeItem) ||
+            test.test((IDefinitionNodeItem<?, ?>) item);
+      });
+    }
+    return ISequence.of(ObjectUtils.notNull(nodes));
+  }
+
+  /**
+   * A wildcard matcher that matches a specific local name in any namespace.
+   */
+  public static class MatchAnyNamespace implements Predicate<IDefinitionNodeItem<?, ?>> {
+    @NonNull
+    private final String localName;
+
+    /**
+     * Construct the matcher using the provided local name for matching.
+     *
+     * @param localName
+     *          the name used to match nodes
+     */
+    public MatchAnyNamespace(@NonNull String localName) {
+      this.localName = localName;
+    }
+
+    @Override
+    public boolean test(IDefinitionNodeItem<?, ?> item) {
+      return localName.equals(item.getName().getLocalPart());
+    }
+  }
+
+  /**
+   * A wildcard matcher that matches any local name in a specific namespace.
+   */
+  public static class MatchAnyLocalName implements Predicate<IDefinitionNodeItem<?, ?>> {
+    @NonNull
+    private final String namespace;
+
+    /**
+     * Construct the matcher using the provided namespace for matching.
+     *
+     * @param namespace
+     *          the namespace used to match nodes
+     */
+    public MatchAnyLocalName(@NonNull String namespace) {
+      this.namespace = namespace;
+    }
+
+    @Override
+    public boolean test(IDefinitionNodeItem<?, ?> item) {
+      return namespace.equals(item.getName().getNamespaceURI());
+    }
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/MetapathFormatter.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/MetapathFormatter.java
index 48af77792..2b1cf765f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/MetapathFormatter.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/format/MetapathFormatter.java
@@ -35,6 +35,7 @@
 import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -60,7 +61,7 @@ public String formatDocument(IDocumentNodeItem document) {
 
   @Override
   public String formatRootAssembly(IRootAssemblyNodeItem root) {
-    return root.getName();
+    return ObjectUtils.notNull(root.getName().getLocalPart());
   }
 
   @Override
@@ -88,7 +89,7 @@ public String formatFlag(IFlagNodeItem flag) {
   @SuppressWarnings("null")
   @NonNull
   private static String formatModelPathSegment(@NonNull IModelNodeItem<?, ?> item) {
-    StringBuilder builder = new StringBuilder(item.getName())
+    StringBuilder builder = new StringBuilder(item.getName().getLocalPart())
         .append('[')
         .append(item.getPosition())
         .append(']');
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/AbstractFunction.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/AbstractFunction.java
index d639a5ec1..b9237cdff 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/AbstractFunction.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/AbstractFunction.java
@@ -28,13 +28,13 @@
 
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 abstract class AbstractFunction implements IFunction {
   @NonNull
-  private final String name;
-  @NonNull
-  private final String namespace;
+  private final QName qname;
   @NonNull
   private final List<IArgument> arguments;
 
@@ -42,19 +42,19 @@ protected AbstractFunction(
       @NonNull String name,
       @NonNull String namespace,
       @NonNull List<IArgument> arguments) {
-    this.name = name;
-    this.namespace = namespace;
-    this.arguments = arguments;
+    this(new QName(namespace, name), arguments);
   }
 
-  @Override
-  public String getName() {
-    return name;
+  protected AbstractFunction(
+      @NonNull QName qname,
+      @NonNull List<IArgument> arguments) {
+    this.qname = qname;
+    this.arguments = arguments;
   }
 
   @Override
-  public String getNamespace() {
-    return namespace;
+  public QName getQName() {
+    return qname;
   }
 
   @Override
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ArithmeticFunctionException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ArithmeticFunctionException.java
index 0e153d284..cfde0d34c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ArithmeticFunctionException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ArithmeticFunctionException.java
@@ -96,7 +96,7 @@ public ArithmeticFunctionException(int code, Throwable cause) {
   }
 
   @Override
-  protected String getCodePrefix() {
+  public String getCodePrefix() {
     return "FOAR";
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ComparisonFunctions.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ComparisonFunctions.java
index dc2c82e91..9c2509a13 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ComparisonFunctions.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ComparisonFunctions.java
@@ -47,6 +47,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+@SuppressWarnings({ "PMD.GodClass", "PMD.CyclomaticComplexity" })
 public final class ComparisonFunctions {
   /**
    * Comparison operators.
@@ -117,9 +118,9 @@ public static IBooleanItem generalCompairison( // NOPMD - acceptable complexity
       @NonNull ISequence<? extends IAnyAtomicItem> rightItems) {
 
     IBooleanItem retval = IBooleanItem.FALSE;
-    for (IAnyAtomicItem left : leftItems.asList()) {
+    for (IAnyAtomicItem left : leftItems.getValue()) {
       assert left != null;
-      for (IAnyAtomicItem right : rightItems.asList()) {
+      for (IAnyAtomicItem right : rightItems.getValue()) {
         assert right != null;
         IAnyAtomicItem leftCast;
         IAnyAtomicItem rightCast;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DateTimeFunctionException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DateTimeFunctionException.java
index a67b5f508..38c007e78 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DateTimeFunctionException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DateTimeFunctionException.java
@@ -102,7 +102,7 @@ public DateTimeFunctionException(int code, Throwable cause) {
   }
 
   @Override
-  protected String getCodePrefix() {
+  public String getCodePrefix() {
     return "FODT";
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DefaultFunction.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DefaultFunction.java
index 8907d8d66..fbf5d1d13 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DefaultFunction.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DefaultFunction.java
@@ -32,9 +32,11 @@
 import gov.nist.secauto.metaschema.core.metapath.MetapathException;
 import gov.nist.secauto.metaschema.core.metapath.function.library.FnData;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.TypeSystem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -43,7 +45,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -192,70 +194,38 @@ public static List<ISequence<?>> convertArguments(
             String.format("argument signature doesn't match '%s'", function.toSignature()));
       }
 
-      assert argument != null;
-
       ISequence<?> parameter = parametersIterator.next();
+      assert argument != null;
+      assert parameter != null;
 
-      int size = parameter.size();
-      Occurrence occurrence = argument.getSequenceType().getOccurrence();
-      switch (occurrence) {
-      case ONE: {
-        if (size != 1) {
-          throw new InvalidTypeMetapathException(
-              null,
-              String.format("a sequence of one expected, but found '%d'", size));
-        }
+      retval.add(convertArgument(argument, parameter));
+    }
+    return retval;
+  }
 
-        IItem item = FunctionUtils.getFirstItem(parameter, true);
-        parameter = item == null ? ISequence.empty() : ISequence.of(item);
-        break;
-      }
-      case ZERO_OR_ONE: {
-        if (size > 1) {
-          throw new InvalidTypeMetapathException(
-              null,
-              String.format("a sequence of zero or one expected, but found '%d'", size));
-        }
+  @NonNull
+  private static ISequence<?> convertArgument(
+      @NonNull IArgument argument,
+      @NonNull ISequence<?> parameter) {
+    // apply occurrence
+    ISequence<?> retval = argument.getSequenceType().getOccurrence().getSequenceHandler().handle(parameter);
 
-        IItem item = FunctionUtils.getFirstItem(parameter, false);
-        parameter = item == null ? ISequence.empty() : ISequence.of(item);
-        break;
-      }
-      case ONE_OR_MORE:
-        if (size < 1) {
-          throw new InvalidTypeMetapathException(
-              null,
-              String.format("a sequence of zero or more expected, but found '%d'", size));
-        }
-        break;
-      case ZERO:
-        if (size != 0) {
-          throw new InvalidTypeMetapathException(
-              null,
-              String.format("an empty sequence expected, but found '%d'", size));
-        }
-        break;
-      case ZERO_OR_MORE:
-      default:
-        // do nothing
-      }
+    // apply function conversion and type promotion to the parameter
+    if (!retval.isEmpty()) {
+      retval = convertSequence(argument, retval);
 
+      // verify resulting values
       Class<? extends IItem> argumentClass = argument.getSequenceType().getType();
-
-      // apply function conversion and type promotion to the parameter
-      parameter = convertSequence(argument, parameter);
-
-      // check resulting values
-      for (IItem item : parameter.asList()) {
+      for (IItem item : retval.getValue()) {
         Class<? extends IItem> itemClass = item.getClass();
         if (!argumentClass.isAssignableFrom(itemClass)) {
           throw new InvalidTypeMetapathException(
               item,
-              String.format("The type '%s' is not a subtype of '%s'", itemClass.getName(), argumentClass.getName()));
+              String.format("The type '%s' is not a subtype of '%s'",
+                  TypeSystem.getName(itemClass),
+                  TypeSystem.getName(argumentClass)));
         }
       }
-
-      retval.add(parameter);
     }
     return retval;
   }
@@ -273,44 +243,38 @@ public static List<ISequence<?>> convertArguments(
    */
   @NonNull
   protected static ISequence<?> convertSequence(@NonNull IArgument argument, @NonNull ISequence<?> sequence) {
-    @NonNull ISequence<?> retval;
-    if (sequence.isEmpty()) {
-      retval = ISequence.empty();
-    } else {
-      ISequenceType requiredSequenceType = argument.getSequenceType();
-      Class<? extends IItem> requiredSequenceTypeClass = requiredSequenceType.getType();
-
-      List<IItem> result = new ArrayList<>(sequence.size());
-
-      boolean atomize = IAnyAtomicItem.class.isAssignableFrom(requiredSequenceTypeClass);
-
-      for (IItem item : sequence.asList()) {
-        assert item != null;
-        if (atomize) {
-          item = FnData.fnDataItem(item); // NOPMD - intentional
-
-          // if (IUntypedAtomicItem.class.isInstance(item)) { // NOPMD
-          // // TODO: apply cast to atomic type
-          // }
-
-          // promote URIs to strings if a string is required
-          if (IStringItem.class.equals(requiredSequenceTypeClass) && IAnyUriItem.class.isInstance(item)) {
-            item = IStringItem.cast((IAnyUriItem) item); // NOPMD - intentional
-          }
-        }
+    ISequenceType requiredSequenceType = argument.getSequenceType();
+    Class<? extends IItem> requiredSequenceTypeClass = requiredSequenceType.getType();
 
-        // item = requiredSequenceType.
-        if (!requiredSequenceTypeClass.isInstance(item)) {
-          throw new InvalidTypeMetapathException(
-              item,
-              String.format("The type '%s' is not a subtype of '%s'", item.getClass().getName(),
-                  requiredSequenceTypeClass.getName()));
-        }
-        result.add(item);
+    Stream<? extends IItem> stream = sequence.safeStream();
+
+    if (IAnyAtomicItem.class.isAssignableFrom(requiredSequenceTypeClass)) {
+      Stream<? extends IAnyAtomicItem> atomicStream = stream.flatMap(FnData::atomize);
+
+      // if (IUntypedAtomicItem.class.isInstance(item)) { // NOPMD
+      // // TODO: apply cast to atomic type
+      // }
+
+      if (IStringItem.class.equals(requiredSequenceTypeClass)) {
+        // promote URIs to strings if a string is required
+        atomicStream = atomicStream.map(item -> IAnyUriItem.class.isInstance(item) ? IStringItem.cast(item) : item);
       }
-      retval = ISequence.of(result);
+
+      stream = atomicStream;
     }
-    return retval;
+
+    stream = stream.peek(item -> {
+      if (!requiredSequenceTypeClass.isInstance(item)) {
+        throw new InvalidTypeMetapathException(
+            item,
+            String.format("The type '%s' is not a subtype of '%s'",
+                item.getClass().getName(),
+                requiredSequenceTypeClass.getName()));
+      }
+    });
+    assert stream != null;
+
+    return ISequence.of(stream);
   }
 
   @Override
@@ -321,7 +285,7 @@ public ISequence<?> execute(
     try {
       List<ISequence<?>> convertedArguments = convertArguments(this, arguments);
 
-      IItem contextItem = isFocusDepenent() ? FunctionUtils.requireFirstItem(focus, true) : null;
+      IItem contextItem = isFocusDepenent() ? ObjectUtils.requireNonNull(focus.getFirstItem(true)) : null;
 
       CallingContext callingContext = null;
       ISequence<?> result = null;
@@ -381,32 +345,6 @@ public String toString() {
     return toSignature();
   }
 
-  @Override
-  public String toSignature() {
-    StringBuilder builder = new StringBuilder()
-        .append("Q{")
-        .append(getNamespace())
-        .append('}')
-        .append(getName()) // name
-        .append('('); // arguments
-
-    List<IArgument> arguments = getArguments();
-    if (arguments.isEmpty()) {
-      builder.append("()");
-    } else {
-      builder.append(arguments.stream().map(argument -> argument.toSignature()).collect(Collectors.joining(",")));
-
-      if (isArityUnbounded()) {
-        builder.append(", ...");
-      }
-    }
-
-    builder.append(") as ")
-        .append(getResult().toSignature());// return type
-
-    return builder.toString();
-  }
-
   public final class CallingContext {
     @Nullable
     private final IItem contextItem;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DocumentFunctionException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DocumentFunctionException.java
index cef0f0aa3..9f35470c0 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DocumentFunctionException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/DocumentFunctionException.java
@@ -104,7 +104,7 @@ public DocumentFunctionException(int code, Throwable cause) {
   }
 
   @Override
-  protected String getCodePrefix() {
+  public String getCodePrefix() {
     return "FODC";
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionLibrary.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionLibrary.java
index 739059485..5e0c4463f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionLibrary.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionLibrary.java
@@ -53,7 +53,7 @@ public class FunctionLibrary implements IFunctionLibrary {
    *           if the provided function has the same arity as a previously
    *           registered function with the same name
    */
-  public void registerFunction(@NonNull IFunction function) {
+  public final void registerFunction(@NonNull IFunction function) {
     registerFunctionByQName(function);
     registerFunctionByName(function);
   }
@@ -89,12 +89,9 @@ private void registerFunctionByName(@NonNull IFunction function) {
   }
 
   @Override
-  public Stream<IFunction> getFunctionsAsStream() {
+  public Stream<IFunction> stream() {
     synchronized (this) {
-      return ObjectUtils.notNull(
-          libraryByQName.values().stream().flatMap(set -> {
-            return set.getFunctionsAsStream();
-          }));
+      return ObjectUtils.notNull(libraryByQName.values().stream().flatMap(NamedFunctionSet::getFunctionsAsStream));
     }
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionService.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionService.java
index 07c94382e..409b0d11f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionService.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionService.java
@@ -31,6 +31,7 @@
 
 import java.util.ServiceLoader;
 import java.util.ServiceLoader.Provider;
+import java.util.stream.Stream;
 
 import javax.xml.namespace.QName;
 
@@ -42,7 +43,7 @@ public final class FunctionService {
   @NonNull
   private final ServiceLoader<IFunctionLibrary> loader;
   @NonNull
-  private IFunctionLibrary library;
+  private final IFunctionLibrary library;
 
   /**
    * Get the singleton instance of the function service.
@@ -59,30 +60,14 @@ public static FunctionService getInstance() {
   @SuppressWarnings("null")
   public FunctionService() {
     this.loader = ServiceLoader.load(IFunctionLibrary.class);
-    this.library = load();
-  }
-
-  /**
-   * Load all known functions registered with this function service.
-   *
-   * @return the function library
-   */
-  @NonNull
-  public IFunctionLibrary load() {
     ServiceLoader<IFunctionLibrary> loader = getLoader();
 
     FunctionLibrary functionLibrary = new FunctionLibrary();
     loader.stream()
         .map(Provider<IFunctionLibrary>::get)
-        .flatMap(library -> {
-          return library.getFunctionsAsStream();
-        })
+        .flatMap(IFunctionLibrary::stream)
         .forEachOrdered(function -> functionLibrary.registerFunction(ObjectUtils.notNull(function)));
-
-    synchronized (this) {
-      this.library = functionLibrary;
-    }
-    return functionLibrary;
+    this.library = functionLibrary;
   }
 
   /**
@@ -95,6 +80,15 @@ private ServiceLoader<IFunctionLibrary> getLoader() {
     return loader;
   }
 
+  /**
+   * Retrieve the collection of function signatures in this library as a stream.
+   *
+   * @return a stream of function signatures
+   */
+  public Stream<IFunction> stream() {
+    return this.library.stream();
+  }
+
   /**
    * Retrieve the function with the provided name that supports the signature of
    * the provided methods, if such a function exists.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionUtils.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionUtils.java
index 3a9790afe..73d7dca75 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionUtils.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/FunctionUtils.java
@@ -112,74 +112,6 @@ public static long asLong(@NonNull BigInteger value) {
     return value.longValueExact();
   }
 
-  /**
-   * Retrieves the first item in a sequence. If the sequence is empty, a
-   * {@link TypeMetapathException} exception is thrown. If requireSingleton is
-   * {@code true} and the sequence contains more than one item, a
-   * {@link TypeMetapathException} is thrown.
-   *
-   * @param <ITEM>
-   *          the item type to return derived from the provided sequence
-   * @param sequence
-   *          the sequence to retrieve the first item from
-   * @param requireSingleton
-   *          if {@code true} then a {@link TypeMetapathException} is thrown if
-   *          the sequence contains more than one item
-   * @return {@code null} if the sequence is empty, or the item otherwise
-   * @throws TypeMetapathException
-   *           if the sequence is empty, or contains more than one item and
-   *           requireSingleton is {@code true}
-   */
-  @NonNull
-  public static <ITEM extends IItem> ITEM requireFirstItem(@NonNull ISequence<ITEM> sequence,
-      boolean requireSingleton) {
-    if (sequence.isEmpty()) {
-      throw new InvalidTypeMetapathException(
-          null,
-          "Expected a non-empty sequence, but sequence was empty.");
-    }
-    List<ITEM> items = sequence.asList();
-    if (requireSingleton && items.size() != 1) {
-      throw new InvalidTypeMetapathException(
-          null,
-          String.format("sequence expected to contain one item, but found '%d'", items.size()));
-    }
-    return ObjectUtils.notNull(items.iterator().next());
-  }
-
-  /**
-   * Retrieves the first item in a sequence. If the sequence is empty, a
-   * {@code null} result is returned. If requireSingleton is {@code true} and the
-   * sequence contains more than one item, a {@link TypeMetapathException} is
-   * thrown.
-   *
-   * @param <ITEM>
-   *          the item type to return derived from the provided sequence
-   * @param sequence
-   *          the sequence to retrieve the first item from
-   * @param requireSingleton
-   *          if {@code true} then a {@link TypeMetapathException} is thrown if
-   *          the sequence contains more than one item
-   * @return {@code null} if the sequence is empty, or the item otherwise
-   * @throws TypeMetapathException
-   *           if the sequence contains more than one item and requireSingleton is
-   *           {@code true}
-   */
-  @Nullable
-  public static <ITEM extends IItem> ITEM getFirstItem(@NonNull ISequence<ITEM> sequence, boolean requireSingleton) {
-    @Nullable ITEM retval = null;
-    if (!sequence.isEmpty()) {
-      List<ITEM> items = sequence.asList();
-      if (requireSingleton && items.size() != 1) {
-        throw new InvalidTypeMetapathException(
-            null,
-            String.format("sequence expected to contain one item, but found '%d'", items.size()));
-      }
-      retval = items.iterator().next();
-    }
-    return retval;
-  }
-
   /**
    * Gets the first item of the provided sequence as a {@link INumericItem} value.
    * If the sequence is empty, then a {@code null} value is returned.
@@ -198,7 +130,7 @@ public static <ITEM extends IItem> ITEM getFirstItem(@NonNull ISequence<ITEM> se
    */
   @Nullable
   public static INumericItem toNumeric(@NonNull ISequence<?> sequence, boolean requireSingleton) {
-    IItem item = getFirstItem(sequence, requireSingleton);
+    IItem item = sequence.getFirstItem(requireSingleton);
     return item == null ? null : toNumeric(item);
   }
 
@@ -215,7 +147,7 @@ public static INumericItem toNumeric(@NonNull ISequence<?> sequence, boolean req
   @NonNull
   public static INumericItem toNumeric(@NonNull IItem item) {
     // atomize
-    IAnyAtomicItem atomicItem = FnData.fnDataItem(item);
+    IAnyAtomicItem atomicItem = ISequence.getFirstItem(FnData.atomize(item), true);
     return toNumeric(atomicItem);
   }
 
@@ -229,7 +161,7 @@ public static INumericItem toNumeric(@NonNull IItem item) {
    *           if the item cannot be cast to a numeric value
    */
   @NonNull
-  public static INumericItem toNumeric(@NonNull IAnyAtomicItem item) {
+  public static INumericItem toNumeric(@Nullable IAnyAtomicItem item) {
     try {
       return IDecimalItem.cast(item);
     } catch (InvalidValueForCastFunctionException ex) {
@@ -373,7 +305,7 @@ public static <TYPE extends IItem> TYPE requireTypeOrNull(Class<TYPE> clazz, @Nu
    */
   @NonNull
   public static Stream<Class<?>> getTypes(@NonNull Stream<? extends IItem> items) {
-    return ObjectUtils.notNull(items.map(item -> item.getClass()));
+    return ObjectUtils.notNull(items.map(Object::getClass));
   }
 
   /**
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IArgument.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IArgument.java
index 6012b557f..451323f9b 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IArgument.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IArgument.java
@@ -76,8 +76,9 @@ static Builder builder() {
    */
   final class Builder {
     private String name;
+    @NonNull
     private Class<? extends IItem> type = IItem.class;
-    private Occurrence occurrence = Occurrence.ONE;
+    private Occurrence occurrence;
 
     private Builder() {
       // construct a new non-initialized builder
@@ -177,7 +178,7 @@ private Builder occurrence(@NonNull Occurrence occurrence) {
     public IArgument build() {
       return new ArgumentImpl(
           ObjectUtils.requireNonNull(name, "the argument name must not be null"),
-          new SequenceTypeImpl(type, occurrence));
+          ISequenceType.of(type, ObjectUtils.requireNonNull(occurrence, "occurrence")));
     }
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunction.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunction.java
index ec45095dd..80db61094 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunction.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunction.java
@@ -39,6 +39,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.xml.namespace.QName;
 
@@ -91,7 +92,9 @@ enum FunctionProperty {
    * @return the function's name
    */
   @NonNull
-  String getName();
+  default String getName() {
+    return ObjectUtils.notNull(getQName().getLocalPart());
+  }
 
   /**
    * Retrieve the namespace of the function.
@@ -99,7 +102,9 @@ enum FunctionProperty {
    * @return the function's namespace
    */
   @NonNull
-  String getNamespace();
+  default String getNamespace() {
+    return ObjectUtils.notNull(getQName().getNamespaceURI());
+  }
 
   /**
    * Retrieve the namespace qualified name of the function.
@@ -107,9 +112,7 @@ enum FunctionProperty {
    * @return the namespace qualified name
    */
   @NonNull
-  default QName getQName() {
-    return new QName(getNamespace(), getName());
-  }
+  QName getQName();
 
   /**
    * Retrieve the set of assigned function properties.
@@ -223,7 +226,16 @@ ISequence<?> execute(
    *
    * @return the signature
    */
-  String toSignature();
+  @NonNull
+  default String toSignature() {
+    return ObjectUtils.notNull(String.format("Q{%s}%s(%s) as %s",
+        getNamespace(),
+        getName(),
+        getArguments().isEmpty() ? ""
+            : getArguments().stream().map(IArgument::toSignature).collect(Collectors.joining(","))
+                + (isArityUnbounded() ? ", ..." : ""),
+        getResult().toSignature()));
+  }
 
   /**
    * Construct a new function signature builder.
@@ -247,7 +259,9 @@ final class Builder {
     private final EnumSet<FunctionProperty> properties = EnumSet.noneOf(FunctionProperty.class);
     @NonNull
     private final List<IArgument> arguments = new LinkedList<>();
+    @NonNull
     private Class<? extends IItem> returnType = IItem.class;
+    @NonNull
     private Occurrence returnOccurrence = Occurrence.ONE;
     private IFunctionExecutor functionHandler;
 
@@ -500,15 +514,6 @@ public Builder functionHandler(@NonNull IFunctionExecutor handler) {
      */
     @NonNull
     public IFunction build() {
-      ISequenceType sequenceType;
-      if (returnType == null) {
-        sequenceType = ISequenceType.EMPTY;
-      } else {
-        sequenceType = new SequenceTypeImpl(
-            returnType,
-            ObjectUtils.requireNonNull(returnOccurrence, "the return occurrence must not be null"));
-      }
-
       if (properties.contains(FunctionProperty.UNBOUNDED_ARITY) && arguments.isEmpty()) {
         throw new IllegalStateException("to allow unbounded arity, at least one argument must be provided");
       }
@@ -518,7 +523,7 @@ public IFunction build() {
           ObjectUtils.requireNonNull(namespace, "the namespace must not be null"),
           properties,
           new ArrayList<>(arguments),
-          sequenceType,
+          ISequenceType.of(returnType, returnOccurrence),
           ObjectUtils.requireNonNull(functionHandler, "the function handler must not be null"));
     }
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionLibrary.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionLibrary.java
index 393e9c36f..12616701a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionLibrary.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/IFunctionLibrary.java
@@ -40,7 +40,7 @@ public interface IFunctionLibrary {
    * @return a stream of function signatures
    */
   @NonNull
-  Stream<IFunction> getFunctionsAsStream();
+  Stream<IFunction> stream();
 
   /**
    * Determine if there is a function with the provided name that supports the
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ISequenceType.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ISequenceType.java
index dbb26a80e..cee125556 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ISequenceType.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/ISequenceType.java
@@ -45,7 +45,7 @@ public Class<? extends IItem> getType() {
 
     @Override
     public Occurrence getOccurrence() {
-      return null;
+      return Occurrence.ZERO;
     }
 
     @Override
@@ -54,6 +54,23 @@ public String toSignature() {
     }
   };
 
+  /**
+   * Create new sequence type using the provide type and occurrence.
+   *
+   * @param type
+   *          the sequence item type
+   * @param occurrence
+   *          the expected occurrence of the sequence
+   * @return the new sequence type
+   */
+  @SuppressWarnings("PMD.ShortMethodName")
+  @NonNull
+  static ISequenceType of(@NonNull Class<? extends IItem> type, @NonNull Occurrence occurrence) {
+    return Occurrence.ZERO.equals(occurrence)
+        ? EMPTY
+        : new SequenceTypeImpl(type, occurrence);
+  }
+
   /**
    * Determine if the sequence is empty (if it holds any data) or not.
    *
@@ -71,8 +88,8 @@ public String toSignature() {
   /**
    * Get the occurrence of the sequence.
    *
-   * @return the occurrence of the sequence or {@code null} if the sequence is
-   *         empty
+   * @return the occurrence of the sequence or {@code Occurrence#ZERO} if the
+   *         sequence is empty
    */
   Occurrence getOccurrence();
 
@@ -81,5 +98,6 @@ public String toSignature() {
    *
    * @return the signature
    */
+  @NonNull
   String toSignature();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidArgumentFunctionException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidArgumentFunctionException.java
index b3504b28a..37b62a3b7 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidArgumentFunctionException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidArgumentFunctionException.java
@@ -103,7 +103,7 @@ public InvalidArgumentFunctionException(int code, Throwable cause) {
   }
 
   @Override
-  protected String getCodePrefix() {
+  public String getCodePrefix() {
     return "FORG";
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidTypeFunctionException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidTypeFunctionException.java
index 9fe744ca9..05b78569a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidTypeFunctionException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidTypeFunctionException.java
@@ -95,7 +95,7 @@ private static String generateMessage(@NonNull IItem item) {
   }
 
   @Override
-  protected String getCodePrefix() {
+  public String getCodePrefix() {
     return "FOTY";
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidValueForCastFunctionException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidValueForCastFunctionException.java
index 0750128fc..183640e9b 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidValueForCastFunctionException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/InvalidValueForCastFunctionException.java
@@ -41,7 +41,7 @@ public class InvalidValueForCastFunctionException
    *          the exception message
    */
   public InvalidValueForCastFunctionException(String message) {
-    super(InvalidArgumentFunctionException.INVALID_VALUE_FOR_CAST, message);
+    super(INVALID_VALUE_FOR_CAST, message);
   }
 
   /**
@@ -54,7 +54,7 @@ public InvalidValueForCastFunctionException(String message) {
    *          the original exception cause
    */
   public InvalidValueForCastFunctionException(String message, Throwable cause) {
-    super(InvalidArgumentFunctionException.INVALID_VALUE_FOR_CAST, message, cause);
+    super(INVALID_VALUE_FOR_CAST, message, cause);
   }
 
   /**
@@ -64,7 +64,7 @@ public InvalidValueForCastFunctionException(String message, Throwable cause) {
    *          the original exception cause
    */
   public InvalidValueForCastFunctionException(Throwable cause) {
-    super(InvalidArgumentFunctionException.INVALID_VALUE_FOR_CAST, cause);
+    super(INVALID_VALUE_FOR_CAST, cause);
   }
 
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/JsonFunctionException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/JsonFunctionException.java
new file mode 100644
index 000000000..78af9739b
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/JsonFunctionException.java
@@ -0,0 +1,98 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function;
+
+import gov.nist.secauto.metaschema.core.metapath.AbstractCodedMetapathException;
+
+public class JsonFunctionException
+    extends AbstractCodedMetapathException {
+  /**
+   * <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#ERRFOJS0003">err:FOJS0003</a>:
+   * This error is raised if the input contains duplicate keys, when the chosen
+   * policy is to reject duplicates.
+   */
+  public static final int DUPLICATE_KEYS = 3;
+
+  /**
+   * <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#ERRFOJS0005">err:FOJS0005</a>:
+   * This error is raised if the $options map contains an invalid entry.
+   */
+  public static final int INVALID_OPTION = 5;
+
+  /**
+   * the serial version UID.
+   */
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * Constructs a new exception with the provided {@code code}, {@code message},
+   * and no cause.
+   *
+   * @param code
+   *          the error code value
+   * @param message
+   *          the exception message
+   */
+  public JsonFunctionException(int code, String message) {
+    super(code, message);
+  }
+
+  /**
+   * Constructs a new exception with the provided {@code code}, {@code message},
+   * and {@code cause}.
+   *
+   * @param code
+   *          the error code value
+   * @param message
+   *          the exception message
+   * @param cause
+   *          the original exception cause
+   */
+  public JsonFunctionException(int code, String message, Throwable cause) {
+    super(code, message, cause);
+  }
+
+  /**
+   * Constructs a new exception with the provided {@code code}, no message, and
+   * the {@code cause}.
+   *
+   * @param code
+   *          the error code value
+   * @param cause
+   *          the original exception cause
+   */
+  public JsonFunctionException(int code, Throwable cause) {
+    super(code, cause);
+  }
+
+  @Override
+  public String getCodePrefix() {
+    return "FOJS";
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/Occurrence.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/Occurrence.java
index 95fde71dc..617fec1b7 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/Occurrence.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/Occurrence.java
@@ -26,8 +26,14 @@
 
 package gov.nist.secauto.metaschema.core.metapath.function;
 
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.InvalidTypeMetapathException;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+
 import java.util.Objects;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 /**
  * Identifies the occurrence of a sequence used a function argument or return
  * value.
@@ -36,31 +42,35 @@ public enum Occurrence {
   /**
    * An empty sequence.
    */
-  ZERO("", true),
+  ZERO("", true, Occurrence::handleZero),
   /**
    * The occurrence indicator {@code "?"}.
    */
-  ZERO_OR_ONE("?", true),
+  ZERO_OR_ONE("?", true, Occurrence::handleZeroOrOne),
   /**
    * No occurrence indicator.
    */
-  ONE("", false),
+  ONE("", false, Occurrence::handleOne),
   /**
    * The occurrence indicator {@code "*"}.
    */
-  ZERO_OR_MORE("*", true),
+  ZERO_OR_MORE("*", true, Occurrence::handleZeroOrMore),
   /**
    * The occurrence indicator {@code "+"}.
    */
-  ONE_OR_MORE("+", false);
+  ONE_OR_MORE("+", false, Occurrence::handleOneOrMore);
 
+  @NonNull
   private final String indicator;
   private final boolean optional;
+  @NonNull
+  private final ISequenceHandler sequenceHandler;
 
-  Occurrence(String indicator, boolean optional) {
+  Occurrence(@NonNull String indicator, boolean optional, @NonNull ISequenceHandler sequenceHandler) {
     Objects.requireNonNull(indicator, "indicator");
     this.indicator = indicator;
     this.optional = optional;
+    this.sequenceHandler = sequenceHandler;
   }
 
   /**
@@ -68,6 +78,7 @@ public enum Occurrence {
    *
    * @return the occurrence indicator
    */
+  @NonNull
   public String getIndicator() {
     return indicator;
   }
@@ -81,4 +92,88 @@ public String getIndicator() {
   public boolean isOptional() {
     return optional;
   }
+
+  /**
+   * Get the handler used to check that a sequence meets the occurrence
+   * requirement.
+   *
+   * @return the handler
+   */
+  @NonNull
+  public ISequenceHandler getSequenceHandler() {
+    return sequenceHandler;
+  }
+
+  @NonNull
+  private static <T extends IItem> ISequence<T> handleZero(@NonNull ISequence<T> sequence) {
+    int size = sequence.size();
+    if (size != 0) {
+      throw new InvalidTypeMetapathException(
+          null,
+          String.format("an empty sequence expected, but size is '%d'", size));
+    }
+    return ISequence.empty();
+  }
+
+  @NonNull
+  private static <T extends IItem> ISequence<T> handleOne(@NonNull ISequence<T> sequence) {
+    int size = sequence.size();
+    if (size != 1) {
+      throw new InvalidTypeMetapathException(
+          null,
+          String.format("a sequence of one expected, but size is '%d'", size));
+    }
+
+    T item = sequence.getFirstItem(true);
+    return item == null ? ISequence.empty() : ISequence.of(item);
+  }
+
+  @NonNull
+  private static <T extends IItem> ISequence<T> handleZeroOrOne(@NonNull ISequence<T> sequence) {
+    int size = sequence.size();
+    if (size > 1) {
+      throw new InvalidTypeMetapathException(
+          null,
+          String.format("a sequence of zero or one expected, but size is '%d'", size));
+    }
+
+    T item = sequence.getFirstItem(false);
+    return item == null ? ISequence.empty() : ISequence.of(item);
+  }
+
+  @NonNull
+  private static <T extends IItem> ISequence<T> handleZeroOrMore(@NonNull ISequence<T> sequence) {
+    return sequence;
+  }
+
+  @NonNull
+  private static <T extends IItem> ISequence<T> handleOneOrMore(@NonNull ISequence<T> sequence) {
+    int size = sequence.size();
+    if (size < 1) {
+      throw new InvalidTypeMetapathException(
+          null,
+          String.format("a sequence of one or more expected, but size is '%d'", size));
+    }
+    return sequence;
+  }
+
+  @FunctionalInterface
+  public interface ISequenceHandler {
+    /**
+     * Check the provided sequence matches the occurrence.
+     * <p>
+     * This method may return a new sequence that more efficiently addresses the
+     * occurrence.
+     *
+     * @param <T>
+     *          the sequence item Java type
+     * @param sequence
+     *          the sequence to check occurrence for
+     * @return the sequence
+     * @throws InvalidTypeMetapathException
+     *           if the sequence doesn't match the required occurrence
+     */
+    @NonNull
+    <T extends IItem> ISequence<T> handle(@NonNull ISequence<T> sequence);
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/OperationFunctions.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/OperationFunctions.java
index 018a10512..2a8078eb8 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/OperationFunctions.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/OperationFunctions.java
@@ -62,14 +62,36 @@ private OperationFunctions() {
     // disable
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-add-yearMonthDuration-to-date">op:add-yearMonthDuration-to-date</a>.
+   *
+   * @param instant
+   *          a point in time
+   * @param duration
+   *          the duration to add
+   * @return the result of adding the duration to the date
+   */
   @NonNull
-  public static IDateItem opAddYearMonthDurationToDate(@NonNull IDateItem arg1, @NonNull IYearMonthDurationItem arg2) {
-    return addDurationToDate(arg1.asZonedDateTime(), arg2.asPeriod());
+  public static IDateItem opAddYearMonthDurationToDate(@NonNull IDateItem instant,
+      @NonNull IYearMonthDurationItem duration) {
+    return addDurationToDate(instant.asZonedDateTime(), duration.asPeriod());
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-add-dayTimeDuration-to-date">op:add-dayTimeDuration-to-date</a>.
+   *
+   * @param instant
+   *          a point in time
+   * @param duration
+   *          the duration to add
+   * @return the result of adding the duration to the date
+   */
   @NonNull
-  public static IDateItem opAddDayTimeDurationToDate(@NonNull IDateItem arg1, @NonNull IDayTimeDurationItem arg2) {
-    return addDurationToDate(arg1.asZonedDateTime(), arg2.asDuration());
+  public static IDateItem opAddDayTimeDurationToDate(@NonNull IDateItem instant,
+      @NonNull IDayTimeDurationItem duration) {
+    return addDurationToDate(instant.asZonedDateTime(), duration.asDuration());
   }
 
   @NonNull
@@ -84,6 +106,16 @@ private static IDateItem addDurationToDate(@NonNull ZonedDateTime dateTime, @Non
     return IDateItem.valueOf(result);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-add-yearMonthDurations">op:add-yearMonthDurations</a>.
+   *
+   * @param arg1
+   *          the first duration
+   * @param arg2
+   *          the second duration
+   * @return the sum of two duration values
+   */
   @NonNull
   public static IYearMonthDurationItem opAddYearMonthDurations(
       @NonNull IYearMonthDurationItem arg1,
@@ -101,6 +133,16 @@ public static IYearMonthDurationItem opAddYearMonthDurations(
     return IYearMonthDurationItem.valueOf(result);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-add-dayTimeDurations">op:add-dayTimeDurations</a>.
+   *
+   * @param arg1
+   *          the first duration
+   * @param arg2
+   *          the second duration
+   * @return the sum of two duration values
+   */
   @NonNull
   public static IDayTimeDurationItem opAddDayTimeDurations(
       @NonNull IDayTimeDurationItem arg1,
@@ -118,13 +160,23 @@ public static IDayTimeDurationItem opAddDayTimeDurations(
     return IDayTimeDurationItem.valueOf(result);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-add-yearMonthDuration-to-dateTime">op:add-yearMonthDuration-to-dateTime</a>.
+   *
+   * @param instant
+   *          a point in time
+   * @param duration
+   *          the duration to add
+   * @return the result of adding the duration to the date
+   */
   @NonNull
   public static IDateTimeItem opAddYearMonthDurationToDateTime(
-      @NonNull IDateTimeItem arg1,
-      @NonNull IYearMonthDurationItem arg2) {
+      @NonNull IDateTimeItem instant,
+      @NonNull IYearMonthDurationItem duration) {
     ZonedDateTime result;
     try {
-      result = arg1.asZonedDateTime().plus(arg2.asPeriod());
+      result = instant.asZonedDateTime().plus(duration.asPeriod());
     } catch (ArithmeticException ex) {
       throw new ArithmeticFunctionException(ArithmeticFunctionException.OVERFLOW_UNDERFLOW_ERROR, ex);
     }
@@ -132,13 +184,23 @@ public static IDateTimeItem opAddYearMonthDurationToDateTime(
     return IDateTimeItem.valueOf(result);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-add-dayTimeDuration-to-dateTime">op:add-dayTimeDuration-to-dateTime</a>.
+   *
+   * @param instant
+   *          a point in time
+   * @param duration
+   *          the duration to add
+   * @return the result of adding the duration to the date
+   */
   @NonNull
   public static IDateTimeItem opAddDayTimeDurationToDateTime(
-      @NonNull IDateTimeItem arg1,
-      @NonNull IDayTimeDurationItem arg2) {
+      @NonNull IDateTimeItem instant,
+      @NonNull IDayTimeDurationItem duration) {
     ZonedDateTime result;
     try {
-      result = arg1.asZonedDateTime().plus(arg2.asDuration());
+      result = instant.asZonedDateTime().plus(duration.asDuration());
     } catch (ArithmeticException ex) {
       throw new ArithmeticFunctionException(ArithmeticFunctionException.OVERFLOW_UNDERFLOW_ERROR, ex);
     }
@@ -146,23 +208,53 @@ public static IDateTimeItem opAddDayTimeDurationToDateTime(
     return IDateTimeItem.valueOf(result);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-subtract-dates">op:subtract-dates</a>.
+   *
+   * @param date1
+   *          the first point in time
+   * @param date2
+   *          the second point in time
+   * @return the elapsed time between the starting instant and ending instant
+   */
   @NonNull
-  public static IDayTimeDurationItem opSubtractDates(@NonNull IDateItem arg1, @NonNull IDateItem arg2) {
-    return between(arg1.asZonedDateTime(), arg2.asZonedDateTime());
+  public static IDayTimeDurationItem opSubtractDates(@NonNull IDateItem date1, @NonNull IDateItem date2) {
+    return between(date1.asZonedDateTime(), date2.asZonedDateTime());
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-subtract-yearMonthDuration-from-date">op:subtract-yearMonthDuration-from-date</a>.
+   *
+   * @param date
+   *          a point in time
+   * @param duration
+   *          the duration to subtract
+   * @return the result of subtracting the duration from the date
+   */
   @NonNull
   public static IDateItem opSubtractYearMonthDurationFromDate(
-      @NonNull IDateItem arg1,
-      @NonNull IYearMonthDurationItem arg2) {
-    return subtractDurationFromDate(arg1.asZonedDateTime(), arg2.asPeriod());
+      @NonNull IDateItem date,
+      @NonNull IYearMonthDurationItem duration) {
+    return subtractDurationFromDate(date.asZonedDateTime(), duration.asPeriod());
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-subtract-dayTimeDuration-from-date">op:subtract-dayTimeDuration-from-date</a>.
+   *
+   * @param date
+   *          a point in time
+   * @param duration
+   *          the duration to subtract
+   * @return the result of subtracting the duration from the date
+   */
   @NonNull
   public static IDateItem opSubtractDayTimeDurationFromDate(
-      @NonNull IDateItem arg1,
-      @NonNull IDayTimeDurationItem arg2) {
-    return subtractDurationFromDate(arg1.asZonedDateTime(), arg2.asDuration());
+      @NonNull IDateItem date,
+      @NonNull IDayTimeDurationItem duration) {
+    return subtractDurationFromDate(date.asZonedDateTime(), duration.asDuration());
   }
 
   @NonNull
@@ -174,6 +266,16 @@ private static IDateItem subtractDurationFromDate(
     return IDateItem.valueOf(result);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-subtract-yearMonthDurations">op:subtract-yearMonthDurations</a>.
+   *
+   * @param arg1
+   *          the first duration
+   * @param arg2
+   *          the second duration
+   * @return the result of subtracting the second duration from the first
+   */
   @NonNull
   public static IYearMonthDurationItem opSubtractYearMonthDurations(
       @NonNull IYearMonthDurationItem arg1,
@@ -186,6 +288,16 @@ public static IYearMonthDurationItem opSubtractYearMonthDurations(
     return IYearMonthDurationItem.valueOf(duration);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-subtract-dayTimeDurations">op:subtract-dayTimeDurations</a>.
+   *
+   * @param arg1
+   *          the first duration
+   * @param arg2
+   *          the second duration
+   * @return the result of subtracting the second duration from the first
+   */
   @NonNull
   public static IDayTimeDurationItem opSubtractDayTimeDurations(
       @NonNull IDayTimeDurationItem arg1,
@@ -198,11 +310,31 @@ public static IDayTimeDurationItem opSubtractDayTimeDurations(
     return IDayTimeDurationItem.valueOf(duration);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-subtract-dateTimes">op:subtract-dateTimes</a>.
+   *
+   * @param time1
+   *          the first point in time
+   * @param time2
+   *          the second point in time
+   * @return the duration the occurred between the two points in time
+   */
   @NonNull
-  public static IDayTimeDurationItem opSubtractDateTimes(@NonNull IDateTimeItem arg1, @NonNull IDateTimeItem arg2) {
-    return between(arg1.asZonedDateTime(), arg2.asZonedDateTime());
+  public static IDayTimeDurationItem opSubtractDateTimes(@NonNull IDateTimeItem time1, @NonNull IDateTimeItem time2) {
+    return between(time1.asZonedDateTime(), time2.asZonedDateTime());
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-subtract-dateTimes">op:subtract-dateTimes</a>.
+   *
+   * @param time1
+   *          the first point in time
+   * @param time2
+   *          the second point in time
+   * @return the duration the occurred between the two points in time
+   */
   @NonNull
   private static IDayTimeDurationItem between(@NonNull ZonedDateTime time1, @NonNull ZonedDateTime time2) {
     @SuppressWarnings("null")
@@ -210,25 +342,56 @@ private static IDayTimeDurationItem between(@NonNull ZonedDateTime time1, @NonNu
     return IDayTimeDurationItem.valueOf(between);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-subtract-yearMonthDuration-from-dateTime">op:subtract-yearMonthDuration-from-dateTime</a>.
+   *
+   * @param moment
+   *          a point in time
+   * @param duration
+   *          the duration to subtract
+   * @return the result of subtracting the duration from a point in time
+   */
   @NonNull
   public static IDateTimeItem opSubtractYearMonthDurationFromDateTime(
-      @NonNull IDateTimeItem arg1,
-      @NonNull IYearMonthDurationItem arg2) {
+      @NonNull IDateTimeItem moment,
+      @NonNull IYearMonthDurationItem duration) {
     @SuppressWarnings("null")
-    @NonNull ZonedDateTime dateTime = arg1.asZonedDateTime().minus(arg2.asPeriod());
+    @NonNull ZonedDateTime dateTime = moment.asZonedDateTime().minus(duration.asPeriod());
     return IDateTimeItem.valueOf(dateTime);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-subtract-dayTimeDuration-from-dateTime">op:subtract-dayTimeDuration-from-dateTime</a>.
+   *
+   * @param moment
+   *          a point in time
+   * @param duration
+   *          the duration to subtract
+   * @return the result of subtracting the duration from a point in time
+   */
   @NonNull
   public static IDateTimeItem opSubtractDayTimeDurationFromDateTime(
-      @NonNull IDateTimeItem arg1,
-      @NonNull IDayTimeDurationItem arg2) {
+      @NonNull IDateTimeItem moment,
+      @NonNull IDayTimeDurationItem duration) {
 
     @SuppressWarnings("null")
-    @NonNull ZonedDateTime dateTime = arg1.asZonedDateTime().plus(arg2.asDuration());
+    @NonNull ZonedDateTime dateTime = moment.asZonedDateTime().plus(duration.asDuration());
     return IDateTimeItem.valueOf(dateTime);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-multiply-yearMonthDuration">op:multiply-yearMonthDuration</a>.
+   *
+   * @param arg1
+   *          the duration value
+   * @param arg2
+   *          the number to multiply by
+   * @return the result of multiplying a {@link IYearMonthDurationItem} by a
+   *         number
+   */
   @NonNull
   public static IYearMonthDurationItem opMultiplyYearMonthDuration(
       @NonNull IYearMonthDurationItem arg1,
@@ -245,6 +408,16 @@ public static IYearMonthDurationItem opMultiplyYearMonthDuration(
     return IYearMonthDurationItem.valueOf(period);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-multiply-dayTimeDuration">op:multiply-dayTimeDuration</a>.
+   *
+   * @param arg1
+   *          the duration value
+   * @param arg2
+   *          the number to multiply by
+   * @return the result of multiplying a {@link IDayTimeDurationItem} by a number
+   */
   @NonNull
   public static IDayTimeDurationItem opMultiplyDayTimeDuration(
       @NonNull IDayTimeDurationItem arg1,
@@ -261,6 +434,16 @@ public static IDayTimeDurationItem opMultiplyDayTimeDuration(
     return IDayTimeDurationItem.valueOf(duration);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-divide-yearMonthDuration">op:divide-yearMonthDuration</a>.
+   *
+   * @param arg1
+   *          the duration value
+   * @param arg2
+   *          the number to divide by
+   * @return the result of dividing a {@link IYearMonthDurationItem} by a number
+   */
   @NonNull
   public static IYearMonthDurationItem opDivideYearMonthDuration(
       @NonNull IYearMonthDurationItem arg1,
@@ -279,6 +462,16 @@ public static IYearMonthDurationItem opDivideYearMonthDuration(
     return IYearMonthDurationItem.valueOf(years, months);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-divide-dayTimeDuration">op:divide-dayTimeDuration</a>.
+   *
+   * @param arg1
+   *          the duration value
+   * @param arg2
+   *          the number to divide by
+   * @return the result of dividing a {@link IDayTimeDurationItem} by a number
+   */
   @NonNull
   public static IDayTimeDurationItem opDivideDayTimeDuration(
       @NonNull IDayTimeDurationItem arg1,
@@ -286,13 +479,23 @@ public static IDayTimeDurationItem opDivideDayTimeDuration(
     try {
       @SuppressWarnings("null")
       @NonNull Duration duration = arg1.asDuration().dividedBy(FunctionUtils.asLong(arg2.round()));
-      return IDayTimeDurationItem
-          .valueOf(duration);
+      return IDayTimeDurationItem.valueOf(duration);
     } catch (ArithmeticException ex) {
       throw new ArithmeticFunctionException(ArithmeticFunctionException.DIVISION_BY_ZERO, "Division by zero", ex);
     }
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-divide-dayTimeDuration-by-dayTimeDuration">op:divide-dayTimeDuration-by-dayTimeDuration</a>.
+   *
+   * @param arg1
+   *          the first duration value
+   * @param arg2
+   *          the second duration value
+   * @return the ratio of two {@link IDayTimeDurationItem} values, as a decimal
+   *         number
+   */
   @NonNull
   public static IDecimalItem opDivideDayTimeDurationByDayTimeDuration(
       @NonNull IDayTimeDurationItem arg1,
@@ -303,38 +506,115 @@ public static IDecimalItem opDivideDayTimeDurationByDayTimeDuration(
             IDecimalItem.valueOf(arg2.asSeconds())));
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-date-equal">op:date-equal</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is the same instant in time as the
+   *         second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opDateEqual(@NonNull IDateItem arg1, @NonNull IDateItem arg2) {
     // TODO: avoid cast?
     return opDateTimeEqual(IDateTimeItem.cast(arg1), IDateTimeItem.cast(arg2));
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-dateTime-equal">op:dateTime-equal</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is the same instant in time as the
+   *         second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opDateTimeEqual(@NonNull IDateTimeItem arg1, @NonNull IDateTimeItem arg2) {
     return IBooleanItem.valueOf(arg1.asZonedDateTime().equals(arg2.asZonedDateTime()));
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-duration-equal">op:duration-equal</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is the same duration as the
+   *         second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opDurationEqual(@NonNull IDurationItem arg1, @NonNull IDurationItem arg2) {
     return IBooleanItem.valueOf(arg1.compareTo(arg2) == 0);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-base64Binary-equal">op:base64Binary-equal</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is equal to the second, or
+   *         {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opBase64BinaryEqual(@NonNull IBase64BinaryItem arg1, @NonNull IBase64BinaryItem arg2) {
     return IBooleanItem.valueOf(arg1.asByteBuffer().equals(arg2.asByteBuffer()));
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-date-greater-than">op:date-greater-than</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is a later instant in time than
+   *         the second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opDateGreaterThan(@NonNull IDateItem arg1, @NonNull IDateItem arg2) {
     // TODO: avoid cast?
     return opDateTimeGreaterThan(IDateTimeItem.cast(arg1), IDateTimeItem.cast(arg2));
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-dateTime-greater-than">op:dateTime-greater-than</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is a later instant in time than
+   *         the second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opDateTimeGreaterThan(@NonNull IDateTimeItem arg1, @NonNull IDateTimeItem arg2) {
     return IBooleanItem.valueOf(arg1.asZonedDateTime().compareTo(arg2.asZonedDateTime()) > 0);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-yearMonthDuration-greater-than">op:yearMonthDuration-greater-than</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is a longer duration than the
+   *         second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opYearMonthDurationGreaterThan(
       @NonNull IYearMonthDurationItem arg1,
@@ -346,6 +626,17 @@ public static IBooleanItem opYearMonthDurationGreaterThan(
     return IBooleanItem.valueOf(p1.toTotalMonths() > p2.toTotalMonths());
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-dayTimeDuration-greater-than">op:dayTimeDuration-greater-than</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is a longer duration than the
+   *         second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opDayTimeDurationGreaterThan(
       @NonNull IDayTimeDurationItem arg1,
@@ -353,6 +644,17 @@ public static IBooleanItem opDayTimeDurationGreaterThan(
     return IBooleanItem.valueOf(arg1.compareTo(arg2) > 0);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-base64Binary-greater-than">op:base64Binary-greater-than</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is greater than the second, or
+   *         {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opBase64BinaryGreaterThan(
       @NonNull IBase64BinaryItem arg1,
@@ -360,6 +662,17 @@ public static IBooleanItem opBase64BinaryGreaterThan(
     return IBooleanItem.valueOf(arg1.compareTo(arg2) > 0);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-date-less-than">op:date-less-than</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is an earlier instant in time than
+   *         the second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opDateLessThan(
       @NonNull IDateItem arg1,
@@ -367,6 +680,17 @@ public static IBooleanItem opDateLessThan(
     return opDateTimeLessThan(IDateTimeItem.cast(arg1), IDateTimeItem.cast(arg2));
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-dateTime-less-than">op:dateTime-less-than</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is an earlier instant in time than
+   *         the second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opDateTimeLessThan(
       @NonNull IDateTimeItem arg1,
@@ -374,6 +698,17 @@ public static IBooleanItem opDateTimeLessThan(
     return IBooleanItem.valueOf(arg1.asZonedDateTime().compareTo(arg2.asZonedDateTime()) < 0);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-yearMonthDuration-less-than">op:yearMonthDuration-less-than</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is a shorter duration than the
+   *         second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opYearMonthDurationLessThan(@NonNull IYearMonthDurationItem arg1,
       @NonNull IYearMonthDurationItem arg2) {
@@ -384,6 +719,17 @@ public static IBooleanItem opYearMonthDurationLessThan(@NonNull IYearMonthDurati
     return IBooleanItem.valueOf(p1.toTotalMonths() < p2.toTotalMonths());
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-dayTimeDuration-less-than">op:dayTimeDuration-less-than</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is a shorter duration than the
+   *         second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opDayTimeDurationLessThan(
       @NonNull IDayTimeDurationItem arg1,
@@ -391,6 +737,17 @@ public static IBooleanItem opDayTimeDurationLessThan(
     return IBooleanItem.valueOf(arg1.compareTo(arg2) < 0);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-base64Binary-less-than">op:base64Binary-less-than</a>.
+   *
+   * @param arg1
+   *          the first value
+   * @param arg2
+   *          the second value
+   * @return {@code true} if the first argument is less than the second, or
+   *         {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opBase64BinaryLessThan(
       @NonNull IBase64BinaryItem arg1,
@@ -398,6 +755,16 @@ public static IBooleanItem opBase64BinaryLessThan(
     return IBooleanItem.valueOf(arg1.compareTo(arg2) < 0);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-numeric-add">op:numeric-add</a>.
+   *
+   * @param left
+   *          the first number
+   * @param right
+   *          the second number
+   * @return the result of adding the second number to the first number
+   */
   @NonNull
   public static INumericItem opNumericAdd(@NonNull INumericItem left, @NonNull INumericItem right) {
     INumericItem retval;
@@ -421,6 +788,16 @@ public static INumericItem opNumericAdd(@NonNull INumericItem left, @NonNull INu
     return retval;
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-numeric-subtract">op:numeric-subtract</a>.
+   *
+   * @param left
+   *          the first number
+   * @param right
+   *          the second number
+   * @return the result of subtracting the second number from the first number
+   */
   @NonNull
   public static INumericItem opNumericSubtract(@NonNull INumericItem left, @NonNull INumericItem right) {
     INumericItem retval;
@@ -444,6 +821,16 @@ public static INumericItem opNumericSubtract(@NonNull INumericItem left, @NonNul
     return retval;
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-numeric-multiply">op:numeric-multiply</a>.
+   *
+   * @param left
+   *          the first number
+   * @param right
+   *          the second number
+   * @return the result of multiplying the first number by the second number
+   */
   @NonNull
   public static INumericItem opNumericMultiply(@NonNull INumericItem left, @NonNull INumericItem right) {
     INumericItem retval;
@@ -464,6 +851,16 @@ public static INumericItem opNumericMultiply(@NonNull INumericItem left, @NonNul
     return retval;
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-numeric-divide">op:numeric-divide</a>.
+   *
+   * @param dividend
+   *          the number to be divided
+   * @param divisor
+   *          the number to divide by
+   * @return the quotient
+   */
   @NonNull
   public static IDecimalItem opNumericDivide(@NonNull INumericItem dividend, @NonNull INumericItem divisor) {
     // create a decimal result
@@ -481,6 +878,16 @@ public static IDecimalItem opNumericDivide(@NonNull INumericItem dividend, @NonN
     return IDecimalItem.valueOf(result);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-numeric-integer-divide">op:numeric-integer-divide</a>.
+   *
+   * @param dividend
+   *          the number to be divided
+   * @param divisor
+   *          the number to divide by
+   * @return the quotient
+   */
   @NonNull
   public static IIntegerItem opNumericIntegerDivide(@NonNull INumericItem dividend, @NonNull INumericItem divisor) {
     IIntegerItem retval;
@@ -517,7 +924,7 @@ public static IIntegerItem opNumericIntegerDivide(@NonNull INumericItem dividend
 
   /**
    * Based on XPath 3.1 <a href=
-   * "https://www.w3.org/TR/xpath-functions-31/#func-numeric-mod">func:numeric-mod</a>.
+   * "https://www.w3.org/TR/xpath-functions-31/#func-numeric-mod">op:numeric-mod</a>.
    *
    * @param dividend
    *          the number to be divided
@@ -547,6 +954,14 @@ public static INumericItem opNumericMod(@NonNull INumericItem dividend, @NonNull
     return retval;
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-numeric-unary-minus">op:numeric-unary-minus</a>.
+   *
+   * @param item
+   *          the number whose sign is to be reversed
+   * @return the number with a reversed sign
+   */
   @NonNull
   public static INumericItem opNumericUnaryMinus(@NonNull INumericItem item) {
     INumericItem retval;
@@ -570,6 +985,17 @@ public static INumericItem opNumericUnaryMinus(@NonNull INumericItem item) {
     return retval;
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-numeric-equal">op:numeric-equal</a>.
+   *
+   * @param arg1
+   *          the first number to check for equality
+   * @param arg2
+   *          the second number to check for equality
+   * @return {@code true} if the numbers are numerically equal or {@code false}
+   *         otherwise
+   */
   @NonNull
   public static IBooleanItem opNumericEqual(@Nullable INumericItem arg1, @Nullable INumericItem arg2) {
     IBooleanItem retval;
@@ -583,6 +1009,17 @@ public static IBooleanItem opNumericEqual(@Nullable INumericItem arg1, @Nullable
     return retval;
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-numeric-greater-than">op:numeric-greater-than</a>.
+   *
+   * @param arg1
+   *          the first number to check
+   * @param arg2
+   *          the second number to check
+   * @return {@code true} if the first number is greater than or equal to the
+   *         second, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opNumericGreaterThan(@Nullable INumericItem arg1, @Nullable INumericItem arg2) {
     IBooleanItem retval;
@@ -598,6 +1035,17 @@ public static IBooleanItem opNumericGreaterThan(@Nullable INumericItem arg1, @Nu
     return retval;
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-numeric-less-than">op:numeric-less-than</a>.
+   *
+   * @param arg1
+   *          the first number to check
+   * @param arg2
+   *          the second number to check
+   * @return {@code true} if the first number is less than or equal to the second,
+   *         or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opNumericLessThan(@Nullable INumericItem arg1, @Nullable INumericItem arg2) {
     IBooleanItem retval;
@@ -613,6 +1061,17 @@ public static IBooleanItem opNumericLessThan(@Nullable INumericItem arg1, @Nulla
     return retval;
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-boolean-equal">op:boolean-equal</a>.
+   *
+   * @param arg1
+   *          the first boolean to check
+   * @param arg2
+   *          the second boolean to check
+   * @return {@code true} if the first boolean is equal to the second, or
+   *         {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opBooleanEqual(@Nullable IBooleanItem arg1, @Nullable IBooleanItem arg2) {
     boolean left = arg1 != null && arg1.toBoolean();
@@ -621,6 +1080,17 @@ public static IBooleanItem opBooleanEqual(@Nullable IBooleanItem arg1, @Nullable
     return IBooleanItem.valueOf(left == right);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-boolean-greater-than">op:boolean-greater-than</a>.
+   *
+   * @param arg1
+   *          the first boolean to check
+   * @param arg2
+   *          the second boolean to check
+   * @return {@code true} if the first argument is {@link IBooleanItem#TRUE} and
+   *         the second is {@link IBooleanItem#FALSE}, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opBooleanGreaterThan(@Nullable IBooleanItem arg1, @Nullable IBooleanItem arg2) {
     boolean left = arg1 != null && arg1.toBoolean();
@@ -629,6 +1099,17 @@ public static IBooleanItem opBooleanGreaterThan(@Nullable IBooleanItem arg1, @Nu
     return IBooleanItem.valueOf(left && !right);
   }
 
+  /**
+   * Based on XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-boolean-less-than">op:boolean-less-than</a>.
+   *
+   * @param arg1
+   *          the first boolean to check
+   * @param arg2
+   *          the second boolean to check
+   * @return {@code true} if the first argument is {@link IBooleanItem#FALSE} and
+   *         the second is {@link IBooleanItem#TRUE}, or {@code false} otherwise
+   */
   @NonNull
   public static IBooleanItem opBooleanLessThan(@Nullable IBooleanItem arg1, @Nullable IBooleanItem arg2) {
     boolean left = arg1 != null && arg1.toBoolean();
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/SequenceTypeImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/SequenceTypeImpl.java
index 2db8d2ce8..d4dfca126 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/SequenceTypeImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/SequenceTypeImpl.java
@@ -27,14 +27,18 @@
 package gov.nist.secauto.metaschema.core.metapath.function;
 
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.TypeSystem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.Objects;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 class SequenceTypeImpl implements ISequenceType {
   private final Class<? extends IItem> type;
   private final Occurrence occurrence;
 
-  public SequenceTypeImpl(Class<? extends IItem> type, Occurrence occurrence) {
+  public SequenceTypeImpl(@NonNull Class<? extends IItem> type, @NonNull Occurrence occurrence) {
     Objects.requireNonNull(type, "type");
     Objects.requireNonNull(occurrence, "occurrence");
     this.type = type;
@@ -65,12 +69,15 @@ public String toString() {
   public String toSignature() {
     StringBuilder builder = new StringBuilder();
 
+    Class<? extends IItem> type = getType();
     // name
-    builder.append(getType().getName())
+    builder.append(type == null
+        ? ""
+        : TypeSystem.getName(type))
         // occurrence
         .append(getOccurrence().getIndicator());
 
-    return builder.toString();
+    return ObjectUtils.notNull(builder.toString());
   }
 
   @Override
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/UriFunctionException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/UriFunctionException.java
index f30461b7e..d5b3d9a64 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/UriFunctionException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/UriFunctionException.java
@@ -98,7 +98,7 @@ public UriFunctionException(int code, Throwable cause) {
   }
 
   @Override
-  protected String getCodePrefix() {
+  public String getCodePrefix() {
     return "FONS";
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppend.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppend.java
new file mode 100644
index 000000000..c3ac3a69c
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppend.java
@@ -0,0 +1,107 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class ArrayAppend {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("append")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("appendage")
+          .type(IItem.class)
+          .zeroOrMore()
+          .build())
+      .returnType(IArrayItem.class)
+      .returnOne()
+      .functionHandler(ArrayAppend::execute)
+      .build();
+
+  private ArrayAppend() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <T extends ICollectionValue> ISequence<IArrayItem<T>> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IArrayItem<T> array = FunctionUtils.asType(ObjectUtils.requireNonNull(
+        arguments.get(0).getFirstItem(true)));
+    @SuppressWarnings("unchecked") T appendage = (T) arguments.get(1).toCollectionValue();
+
+    return ISequence.of(append(array, appendage));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-append">array:append</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @param appendage
+   *          the Metapath item to append to the identified array
+   * @return a new array containing the modification
+   */
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> append(
+      @NonNull IArrayItem<T> array,
+      @NonNull T appendage) {
+
+    List<T> copy = new ArrayList<>(array);
+    copy.add(appendage);
+
+    return IArrayItem.ofCollection(copy);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlatten.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlatten.java
new file mode 100644
index 000000000..39f0f77c5
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlatten.java
@@ -0,0 +1,110 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class ArrayFlatten {
+  @NonNull
+  static final IFunction SIGNATURE = IFunction.builder()
+      .name("flatten")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("input")
+          .type(IItem.class)
+          .zeroOrMore()
+          .build())
+      .returnType(IItem.class)
+      .returnZeroOrMore()
+      .functionHandler(ArrayFlatten::execute)
+      .build();
+
+  private ArrayFlatten() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static ISequence<?> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    ISequence<?> input = ObjectUtils.requireNonNull(arguments.get(0));
+
+    return ISequence.of(flatten(input));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-flatten">array:flatten</a>.
+   *
+   * @param items
+   *          the items to flatten
+   * @return the stream of flattened items
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static Stream<IItem> flatten(@NonNull List<? extends IItem> items) {
+    return items.stream()
+        .flatMap(ArrayFlatten::flatten);
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-flatten">array:flatten</a>.
+   *
+   * @param item
+   *          the item to flatten
+   * @return the stream of flattened items
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static Stream<IItem> flatten(@NonNull IItem item) {
+    return item instanceof IArrayItem
+        // flatten the array members
+        ? ((IArrayItem<?>) item).stream()
+            .flatMap(member -> member.asSequence().stream()
+                .flatMap(ArrayFlatten::flatten))
+        // use the item
+        : ObjectUtils.notNull(Stream.of(item));
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGet.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGet.java
new file mode 100644
index 000000000..b03ccaeb5
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGet.java
@@ -0,0 +1,135 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.ArrayException;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class ArrayGet {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("get")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("position")
+          .type(IIntegerItem.class)
+          .one()
+          .build())
+      .returnType(IItem.class)
+      .returnZeroOrOne()
+      .functionHandler(ArrayGet::execute)
+      .build();
+
+  private ArrayGet() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static ISequence<?> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IArrayItem<?> array = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0).getFirstItem(true)));
+    IIntegerItem position = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
+
+    return get(array, position).asSequence();
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-get">array:get</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param target
+   *          the array of Metapath items that is the target of retrieval
+   * @param positionItem
+   *          the integer position of the item to retrieve
+   * @return the retrieved item
+   * @throws ArrayException
+   *           if the position is not in the range of 1 to array:size
+   */
+  @NonNull
+  public static <T extends ICollectionValue> T get(
+      @NonNull List<T> target,
+      @NonNull IIntegerItem positionItem) {
+    return get(target, positionItem.asInteger().intValue());
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-get">array:get</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param target
+   *          the array of Metapath items that is the target of retrieval
+   * @param position
+   *          the integer position of the item to retrieve
+   * @return the retrieved item
+   * @throws ArrayException
+   *           if the position is not in the range of 1 to array:size
+   */
+  @NonNull
+  public static <T extends ICollectionValue> T get(
+      @NonNull List<T> target,
+      int position) {
+    try {
+      return ObjectUtils.requireNonNull(target.get(position - 1));
+    } catch (IndexOutOfBoundsException ex) {
+      throw new ArrayException(
+          ArrayException.INDEX_OUT_OF_BOUNDS,
+          String.format("The index %d is outside the range of values for the array size '%d'.",
+              position,
+              target.size()),
+          ex);
+    }
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHead.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHead.java
new file mode 100644
index 000000000..ac5f1d285
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHead.java
@@ -0,0 +1,93 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+public final class ArrayHead {
+  @NonNull
+  static final IFunction SIGNATURE = IFunction.builder()
+      .name("head")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .one()
+          .build())
+      .returnType(IItem.class)
+      .returnZeroOrOne()
+      .functionHandler(ArrayHead::execute)
+      .build();
+
+  private ArrayHead() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static ISequence<?> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IArrayItem<?> array = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0).getFirstItem(true)));
+
+    ICollectionValue result = head(array);
+    return result == null ? ISequence.empty() : result.asSequence();
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-head">array:head</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the array to get the head item from
+   * @return the head item
+   */
+  @Nullable
+  public static <T extends ICollectionValue> T head(@NonNull IArrayItem<T> array) {
+    return array.isEmpty() ? null : array.get(0);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBefore.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBefore.java
new file mode 100644
index 000000000..94568f1e1
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBefore.java
@@ -0,0 +1,142 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.ArrayException;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class ArrayInsertBefore {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("insert-before")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("position")
+          .type(IIntegerItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("member")
+          .type(IItem.class)
+          .zeroOrMore()
+          .build())
+      .returnType(IArrayItem.class)
+      .returnOne()
+      .functionHandler(ArrayInsertBefore::execute)
+      .build();
+
+  private ArrayInsertBefore() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <T extends ICollectionValue> ISequence<IArrayItem<T>> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IArrayItem<T> array = FunctionUtils.asType(ObjectUtils.requireNonNull(
+        arguments.get(0).getFirstItem(true)));
+    IIntegerItem position = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
+    @SuppressWarnings("unchecked") T member = (T) ObjectUtils.requireNonNull(arguments.get(2)).toCollectionValue();
+
+    return ISequence.of(insertBefore(array, position, member));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-insert-before">array:insert-before</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @param positionItem
+   *          the integer position of the item to insert before
+   * @param member
+   *          the Metapath item to insert into the identified array
+   * @return a new array containing the modification
+   * @throws ArrayException
+   *           if the position is not in the range of 1 to array:size
+   */
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> insertBefore(
+      @NonNull IArrayItem<T> array,
+      @NonNull IIntegerItem positionItem,
+      @NonNull T member) {
+    return insertBefore(array, positionItem.asInteger().intValueExact(), member);
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-insert-before">array:insert-before</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @param position
+   *          the integer position of the item to insert before
+   * @param member
+   *          the Metapath item to insert into the identified array
+   * @return a new array containing the modification
+   * @throws ArrayException
+   *           if the position is not in the range of 1 to array:size
+   */
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> insertBefore(
+      @NonNull IArrayItem<T> array,
+      int position,
+      @NonNull T member) {
+    return ArrayJoin.join(ObjectUtils.notNull(List.of(
+        ArraySubarray.subarray(array, 1, position - 1),
+        IArrayItem.of(member),
+        ArraySubarray.subarray(array, position))));
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoin.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoin.java
new file mode 100644
index 000000000..d8d7aa7a3
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoin.java
@@ -0,0 +1,96 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class ArrayJoin {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("join")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .zeroOrMore()
+          .build())
+      .returnType(IItem.class)
+      .returnZeroOrOne()
+      .functionHandler(ArrayJoin::execute)
+      .build();
+
+  private ArrayJoin() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <T extends ICollectionValue> ISequence<? extends IArrayItem<T>> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    ISequence<? extends IArrayItem<T>> arrays = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
+
+    return join(arrays).asSequence();
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-join">array:join</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param arrays
+   *          the arrays to join
+   * @return a new combined array
+   */
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> join(
+      @NonNull Collection<? extends IArrayItem<T>> arrays) {
+    return IArrayItem.ofCollection(ObjectUtils.notNull(arrays.stream()
+        .flatMap(Collection::stream)
+        .collect(Collectors.toList())));
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPut.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPut.java
new file mode 100644
index 000000000..6777a14d2
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPut.java
@@ -0,0 +1,152 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.ArrayException;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class ArrayPut {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("put")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("position")
+          .type(IIntegerItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("member")
+          .type(IItem.class)
+          .zeroOrMore()
+          .build())
+      .returnType(IArrayItem.class)
+      .returnOne()
+      .functionHandler(ArrayPut::execute)
+      .build();
+
+  private ArrayPut() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <T extends ICollectionValue> ISequence<? extends IArrayItem<T>> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IArrayItem<T> array = FunctionUtils.asType(ObjectUtils.requireNonNull(
+        arguments.get(0).getFirstItem(true)));
+    IIntegerItem position = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
+    @SuppressWarnings("unchecked") T member = (T) arguments.get(2).toCollectionValue();
+
+    return put(array, position, member).asSequence();
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-put">array:put</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @param positionItem
+   *          the integer position of the item to replace
+   * @param member
+   *          the Metapath item to replace the identified array member with
+   * @return a new array containing the modification
+   * @throws ArrayException
+   *           if the position is not in the range of 1 to array:size
+   */
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> put(
+      @NonNull IArrayItem<T> array,
+      @NonNull IIntegerItem positionItem,
+      @NonNull T member) {
+    return put(array, positionItem.asInteger().intValueExact(), member);
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-put">array:put</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @param position
+   *          the integer position of the item to replace
+   * @param member
+   *          the Metapath item to replace the identified array member with
+   * @return a new array containing the modification
+   * @throws ArrayException
+   *           if the position is not in the range of 1 to array:size
+   */
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> put(
+      @NonNull IArrayItem<T> array,
+      int position,
+      @NonNull T member) {
+    List<T> copy = new ArrayList<>(array);
+    try {
+      copy.set(position - 1, member);
+    } catch (IndexOutOfBoundsException ex) {
+      throw new ArrayException(
+          ArrayException.INDEX_OUT_OF_BOUNDS,
+          String.format("The position %d is outside the range of values for the array of size '%d'.",
+              position,
+              copy.size()),
+          ex);
+    }
+
+    return IArrayItem.ofCollection(copy);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemove.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemove.java
new file mode 100644
index 000000000..d3791f3a7
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemove.java
@@ -0,0 +1,142 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.ArrayException;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class ArrayRemove {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("remove")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("positions")
+          .type(IIntegerItem.class)
+          .zeroOrMore()
+          .build())
+      .returnType(IArrayItem.class)
+      .returnOne()
+      .functionHandler(ArrayRemove::execute)
+      .build();
+
+  private ArrayRemove() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <T extends IItem> ISequence<IArrayItem<T>> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IArrayItem<T> array = FunctionUtils.asType(ObjectUtils.requireNonNull(
+        arguments.get(0).getFirstItem(true)));
+    ISequence<? extends IIntegerItem> positions = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1)));
+
+    return ISequence.of(removeItems(array, positions));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-remove">array:remove</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @param positions
+   *          the integer position of the items to remove
+   * @return a new array containing the modification
+   * @throws ArrayException
+   *           if the position is not in the range of 1 to array:size
+   */
+  @NonNull
+  public static <T extends IItem> IArrayItem<T> removeItems(
+      @NonNull IArrayItem<T> array,
+      @NonNull Collection<? extends IIntegerItem> positions) {
+    return remove(
+        array,
+        ObjectUtils.notNull(positions.stream()
+            .map(position -> position.asInteger().intValueExact())
+            .collect(Collectors.toSet())));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-remove">array:remove</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @param positions
+   *          the integer position of the items to remove
+   * @return a new array containing the modification
+   * @throws ArrayException
+   *           if the position is not in the range of 1 to array:size
+   */
+  @NonNull
+  public static <T extends IItem> IArrayItem<T> remove(
+      @NonNull IArrayItem<T> array,
+      @NonNull Collection<Integer> positions) {
+    Set<Integer> positionSet = positions instanceof Set ? (Set<Integer>) positions : new HashSet<>(positions);
+
+    List<T> remaining = ObjectUtils.notNull(IntStream.range(1, array.size() + 1)
+        .filter(index -> !positionSet.contains(index))
+        .mapToObj(index -> array.get(index - 1))
+        .collect(Collectors.toList()));
+
+    return IArrayItem.ofCollection(remaining);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverse.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverse.java
new file mode 100644
index 000000000..fba9e9ca7
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverse.java
@@ -0,0 +1,97 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class ArrayReverse {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("reverse")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .one()
+          .build())
+      .returnType(IArrayItem.class)
+      .returnOne()
+      .functionHandler(ArrayReverse::execute)
+      .build();
+
+  private ArrayReverse() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <T extends ICollectionValue> ISequence<IArrayItem<T>> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IArrayItem<T> array = FunctionUtils.asType(ObjectUtils.requireNonNull(
+        arguments.get(0).getFirstItem(true)));
+
+    return ISequence.of(reverse(array));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-reverse">array:reverse</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @return a new array containing the modification
+   */
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> reverse(
+      @NonNull IArrayItem<T> array) {
+    List<T> copy = new ArrayList<>(array);
+    Collections.reverse(copy);
+    return IArrayItem.ofCollection(copy);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySize.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySize.java
new file mode 100644
index 000000000..26370a45c
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySize.java
@@ -0,0 +1,80 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class ArraySize {
+  @NonNull
+  static final IFunction SIGNATURE = IFunction.builder()
+      .name("size")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .one()
+          .build())
+      .returnType(IIntegerItem.class)
+      .returnOne()
+      .functionHandler(ArraySize::execute)
+      .build();
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-size">array:size</a>.
+   *
+   * @param array
+   *          the arrays to join
+   * @return a new combined array
+   */
+  @SuppressWarnings("unused")
+  @NonNull
+  private static ISequence<IIntegerItem> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IArrayItem<?> array = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0).getFirstItem(true)));
+
+    return ISequence.of(IIntegerItem.valueOf(array.size()));
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarray.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarray.java
new file mode 100644
index 000000000..90d830535
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarray.java
@@ -0,0 +1,241 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.ArrayException;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class ArraySubarray {
+  @NonNull
+  public static final IFunction SIGNATURE_TWO_ARG = IFunction.builder()
+      .name("subarray")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("start")
+          .type(IIntegerItem.class)
+          .one()
+          .build())
+      .returnType(IArrayItem.class)
+      .returnOne()
+      .functionHandler(ArraySubarray::executeTwoArg)
+      .build();
+  @NonNull
+  public static final IFunction SIGNATURE_THREE_ARG = IFunction.builder()
+      .name("subarray")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("start")
+          .type(IIntegerItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("length")
+          .type(IIntegerItem.class)
+          .one()
+          .build())
+      .returnType(IArrayItem.class)
+      .returnOne()
+      .functionHandler(ArraySubarray::executeThreeArg)
+      .build();
+
+  private ArraySubarray() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <T extends ICollectionValue> ISequence<IArrayItem<T>> executeTwoArg(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IArrayItem<T> array = FunctionUtils.asType(ObjectUtils.requireNonNull(
+        arguments.get(0).getFirstItem(true)));
+    IIntegerItem start = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
+
+    return ISequence.of(subarray(array, start));
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <T extends ICollectionValue> ISequence<IArrayItem<T>> executeThreeArg(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IArrayItem<T> array = FunctionUtils.asType(ObjectUtils.requireNonNull(
+        arguments.get(0).getFirstItem(true)));
+    IIntegerItem start = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
+    IIntegerItem length = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(2).getFirstItem(true)));
+
+    return ISequence.of(subarray(array, start, length));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-subarray">array:subarray</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @param startItem
+   *          the integer position of the item to start with (inclusive)
+   * @return a new array item consisting of the items in the identified range
+   * @throws ArrayException
+   *           if the position is not in the range of 1 to array:size
+   */
+  @SuppressWarnings("PMD.OnlyOneReturn")
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> subarray(
+      @NonNull IArrayItem<T> array,
+      @NonNull IIntegerItem startItem) {
+    return subarray(array, startItem.asInteger().intValueExact());
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-subarray">array:subarray</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @param startItem
+   *          the integer position of the item to start with (inclusive)
+   * @param lengthItem
+   *          the integer count of items to include starting with the item at the
+   *          start position
+   * @return a new array item consisting of the items in the identified range
+   * @throws ArrayException
+   *           if the length is negative or the position is not in the range of 1
+   *           to array:size
+   */
+  @SuppressWarnings("PMD.OnlyOneReturn")
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> subarray(
+      @NonNull IArrayItem<T> array,
+      @NonNull IIntegerItem startItem,
+      @NonNull IIntegerItem lengthItem) {
+    return subarray(array, startItem.asInteger().intValueExact(), lengthItem.asInteger().intValueExact());
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-subarray">array:subarray</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @param start
+   *          the integer position of the item to start with (inclusive)
+   * @return a new array item consisting of the items in the identified range
+   * @throws ArrayException
+   *           if the length is negative or the position is not in the range of 1
+   *           to array:size
+   */
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> subarray(
+      @NonNull IArrayItem<T> array,
+      int start) {
+    return subarray(array, start, array.size() - start + 1);
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-subarray">array:subarray</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the target Metapath array
+   * @param start
+   *          the integer position of the item to start with (inclusive)
+   * @param length
+   *          the integer count of items to include starting with the item at the
+   *          start position
+   * @return a new array item consisting of the items in the identified range
+   * @throws ArrayException
+   *           if the length is negative or the position is not in the range of 1
+   *           to array:size
+   */
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> subarray(
+      @NonNull IArrayItem<T> array,
+      int start,
+      int length) {
+    if (length < 0) {
+      throw new ArrayException(
+          ArrayException.NEGATIVE_ARRAY_LENGTH, String.format("The length '%d' is negative.", length));
+    }
+
+    List<T> copy;
+    try {
+      copy = array.subList(start - 1, start - 1 + length);
+    } catch (IndexOutOfBoundsException ex) {
+      throw new ArrayException(
+          ArrayException.INDEX_OUT_OF_BOUNDS,
+          String.format("The start + length (%d + %d) exceeds the array length '%d'.",
+              start,
+              length,
+              array.size()),
+          ex);
+    }
+
+    return IArrayItem.ofCollection(new ArrayList<>(copy));
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTail.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTail.java
new file mode 100644
index 000000000..d45ed09df
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTail.java
@@ -0,0 +1,91 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+public final class ArrayTail {
+  @NonNull
+  static final IFunction SIGNATURE = IFunction.builder()
+      .name("tail")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_ARRAY)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("array")
+          .type(IArrayItem.class)
+          .one()
+          .build())
+      .returnType(IItem.class)
+      .returnZeroOrOne()
+      .functionHandler(ArrayTail::execute)
+      .build();
+
+  private ArrayTail() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <T extends IItem> ISequence<IArrayItem<T>> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IArrayItem<T> array = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0).getFirstItem(true)));
+
+    return ISequence.of(tail(array));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-array-tail">array:tail</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath array
+   * @param array
+   *          the array to get the tail items from
+   * @return the tail items
+   */
+  @Nullable
+  public static <T extends IItem> IArrayItem<T> tail(@NonNull IArrayItem<T> array) {
+    return ArraySubarray.subarray(array, 2);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/CastFunction.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/CastFunction.java
index f6c45a1c8..7a08f52fb 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/CastFunction.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/CastFunction.java
@@ -75,6 +75,9 @@ static <ITEM extends IAnyAtomicItem> IFunction signature(
     return IFunction.builder()
         .name(name)
         .namespace(namespace)
+        .deterministic()
+        .contextIndependent()
+        .focusIndependent()
         .argument(IArgument.builder()
             .name("arg1")
             .type(IAnyAtomicItem.class)
@@ -105,7 +108,7 @@ public ISequence<ITEM> execute(@NonNull IFunction function,
     ISequence<? extends IAnyAtomicItem> arg = FunctionUtils.asType(
         ObjectUtils.notNull(arguments.get(0)));
 
-    IAnyAtomicItem item = FunctionUtils.getFirstItem(arg, true);
+    IAnyAtomicItem item = arg.getFirstItem(true);
     if (item == null) {
       return ISequence.empty(); // NOPMD - readability
     }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java
index 21fd664bc..2b40c53a2 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java
@@ -132,6 +132,7 @@ public DefaultFunctionLibrary() { // NOPMD - intentional
     // https://www.w3.org/TR/xpath-functions-31/#func-month-from-date
     // https://www.w3.org/TR/xpath-functions-31/#func-month-from-dateTime
     // https://www.w3.org/TR/xpath-functions-31/#func-months-from-duration
+    // https://www.w3.org/TR/xpath-functions-31/#func-node-name
     // https://www.w3.org/TR/xpath-functions-31/#func-normalize-space
     // https://www.w3.org/TR/xpath-functions-31/#func-normalize-unicode
     // https://www.w3.org/TR/xpath-functions-31/#func-not
@@ -164,6 +165,7 @@ public DefaultFunctionLibrary() { // NOPMD - intentional
     registerFunction(FnStartsWith.SIGNATURE);
     // https://www.w3.org/TR/xpath-functions-31/#func-static-base-uri
     registerFunction(FnStaticBaseUri.SIGNATURE);
+    // P0: https://www.w3.org/TR/xpath-functions-31/#func-string
     // P1: https://www.w3.org/TR/xpath-functions-31/#func-string-join
     // P1: https://www.w3.org/TR/xpath-functions-31/#func-string-length
     // P1: https://www.w3.org/TR/xpath-functions-31/#func-subsequence
@@ -191,29 +193,91 @@ public DefaultFunctionLibrary() { // NOPMD - intentional
     // https://www.w3.org/TR/xpath-functions-31/#func-years-from-duration
     // P2: https://www.w3.org/TR/xpath-functions-31/#func-zero-or-one
 
-    // xpath casting functions
-    registerFunction(
-        CastFunction.signature(MetapathConstants.NS_XML_SCHEMA, "boolean", IBooleanItem.class, IBooleanItem::cast));
-    registerFunction(CastFunction.signature(
-        MetapathConstants.NS_XML_SCHEMA, "date", IDateItem.class, IDateItem::cast));
-    registerFunction(CastFunction.signature(
-        MetapathConstants.NS_XML_SCHEMA, "dateTime", IDateTimeItem.class, IDateTimeItem::cast));
-    registerFunction(CastFunction.signature(
-        MetapathConstants.NS_XML_SCHEMA, "decimal", IDecimalItem.class, IDecimalItem::cast));
-    registerFunction(CastFunction.signature(
-        MetapathConstants.NS_XML_SCHEMA, "duration", IDurationItem.class, IDurationItem::cast));
-    registerFunction(CastFunction.signature(
-        MetapathConstants.NS_XML_SCHEMA, "integer", IIntegerItem.class, IIntegerItem::cast));
-    registerFunction(CastFunction.signature(
-        MetapathConstants.NS_XML_SCHEMA, "NCName", INcNameItem.class, INcNameItem::cast));
-    registerFunction(CastFunction.signature(
-        MetapathConstants.NS_XML_SCHEMA, "nonNegativeInteger", INonNegativeIntegerItem.class,
-        INonNegativeIntegerItem::cast));
-    registerFunction(CastFunction.signature(
-        MetapathConstants.NS_XML_SCHEMA, "positiveInteger", IPositiveIntegerItem.class,
-        IPositiveIntegerItem::cast));
-    registerFunction(CastFunction.signature(
-        MetapathConstants.NS_XML_SCHEMA, "string", IStringItem.class, IStringItem::cast));
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-get
+    registerFunction(ArrayGet.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-size
+    registerFunction(ArraySize.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-put
+    registerFunction(ArrayPut.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-append
+    registerFunction(ArrayAppend.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-subarray
+    registerFunction(ArraySubarray.SIGNATURE_TWO_ARG);
+    registerFunction(ArraySubarray.SIGNATURE_THREE_ARG);
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-remove
+    registerFunction(ArrayRemove.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-insert-before
+    registerFunction(ArrayInsertBefore.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-head
+    registerFunction(ArrayHead.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-tail
+    registerFunction(ArrayTail.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-reverse
+    registerFunction(ArrayReverse.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-join
+    registerFunction(ArrayJoin.SIGNATURE);
+    // P3: https://www.w3.org/TR/xpath-functions-31/#func-array-for-each
+    // P3: https://www.w3.org/TR/xpath-functions-31/#func-array-filter
+    // P3: https://www.w3.org/TR/xpath-functions-31/#func-array-fold-left
+    // P3: https://www.w3.org/TR/xpath-functions-31/#func-array-fold-right
+    // P3: https://www.w3.org/TR/xpath-functions-31/#func-array-for-each-pair
+    // P3: https://www.w3.org/TR/xpath-functions-31/#func-array-sort
+    // https://www.w3.org/TR/xpath-functions-31/#func-array-flatten
+    registerFunction(ArrayFlatten.SIGNATURE);
+
+    // https://www.w3.org/TR/xpath-functions-31/#func-map-merge
+    registerFunction(MapMerge.SIGNATURE_ONE_ARG);
+    registerFunction(MapMerge.SIGNATURE_TWO_ARG);
+    // https://www.w3.org/TR/xpath-functions-31/#func-map-size
+    registerFunction(MapSize.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-map-keys
+    registerFunction(MapKeys.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-map-contains
+    registerFunction(MapContains.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-map-get
+    registerFunction(MapGet.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-map-find
+    registerFunction(MapFind.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-map-put
+    registerFunction(MapPut.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-map-entry
+    registerFunction(MapEntry.SIGNATURE);
+    // https://www.w3.org/TR/xpath-functions-31/#func-map-remove
+    registerFunction(MapRemove.SIGNATURE);
+    // P3: https://www.w3.org/TR/xpath-functions-31/#func-map-for-each
+
+    // // xpath casting functions
+    // registerFunction(
+    // CastFunction.signature(MetapathConstants.NS_XML_SCHEMA, "boolean",
+    // IBooleanItem.class, IBooleanItem::cast));
+    // registerFunction(CastFunction.signature(
+    // MetapathConstants.NS_XML_SCHEMA, "date", IDateItem.class, IDateItem::cast));
+    // registerFunction(CastFunction.signature(
+    // MetapathConstants.NS_XML_SCHEMA, "dateTime", IDateTimeItem.class,
+    // IDateTimeItem::cast));
+    // registerFunction(CastFunction.signature(
+    // MetapathConstants.NS_XML_SCHEMA, "decimal", IDecimalItem.class,
+    // IDecimalItem::cast));
+    // registerFunction(CastFunction.signature(
+    // MetapathConstants.NS_XML_SCHEMA, "duration", IDurationItem.class,
+    // IDurationItem::cast));
+    // registerFunction(CastFunction.signature(
+    // MetapathConstants.NS_XML_SCHEMA, "integer", IIntegerItem.class,
+    // IIntegerItem::cast));
+    // registerFunction(CastFunction.signature(
+    // MetapathConstants.NS_XML_SCHEMA, "NCName", INcNameItem.class,
+    // INcNameItem::cast));
+    // registerFunction(CastFunction.signature(
+    // MetapathConstants.NS_XML_SCHEMA, "nonNegativeInteger",
+    // INonNegativeIntegerItem.class,
+    // INonNegativeIntegerItem::cast));
+    // registerFunction(CastFunction.signature(
+    // MetapathConstants.NS_XML_SCHEMA, "positiveInteger",
+    // IPositiveIntegerItem.class,
+    // IPositiveIntegerItem::cast));
+    // registerFunction(CastFunction.signature(
+    // MetapathConstants.NS_XML_SCHEMA, "string", IStringItem.class,
+    // IStringItem::cast));
 
     // metapath casting functions
     registerFunction(CastFunction.signature(
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAbs.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAbs.java
index 0d0a999f8..98c99d588 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAbs.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAbs.java
@@ -76,10 +76,9 @@ private static ISequence<INumericItem> execute(
       @NonNull List<ISequence<?>> arguments,
       @NonNull DynamicContext dynamicContext,
       IItem focus) {
-    ISequence<? extends INumericItem> sequence = FunctionUtils.asType(
-        ObjectUtils.requireNonNull(arguments.get(0)));
+    ISequence<? extends INumericItem> sequence = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
 
-    INumericItem item = FunctionUtils.getFirstItem(sequence, true);
+    INumericItem item = sequence.getFirstItem(true);
     if (item == null) {
       return ISequence.empty(); // NOPMD - readability
     }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAvg.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAvg.java
index 2f829a3c5..b339475ac 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAvg.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnAvg.java
@@ -93,7 +93,7 @@ private static ISequence<IAnyAtomicItem> execute(
     ISequence<? extends IAnyAtomicItem> sequence = FunctionUtils.asType(
         ObjectUtils.requireNonNull(arguments.get(0)));
 
-    List<? extends IAnyAtomicItem> items = sequence.asList();
+    List<? extends IAnyAtomicItem> items = sequence.getValue();
 
     return ISequence.of(average(items));
   }
@@ -163,7 +163,7 @@ public static IAnyAtomicItem average(@NonNull Collection<? extends IAnyAtomicIte
           InvalidArgumentFunctionException.INVALID_ARGUMENT_TYPE,
           String.format("Values must all be of type '%s'.",
               OperationFunctions.AGGREGATE_MATH_TYPES.stream()
-                  .map(type -> type.getName())
+                  .map(Class::getName)
                   .collect(CustomCollectors.joiningWithOxfordComma(","))));
     }
 
@@ -172,6 +172,7 @@ public static IAnyAtomicItem average(@NonNull Collection<? extends IAnyAtomicIte
     return retval;
   }
 
+  @SuppressWarnings("PMD.UnnecessaryCast")
   @NonNull
   private static <T, R extends T> R average(
       @NonNull Collection<? extends T> items,
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBaseUri.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBaseUri.java
index 91486eda6..e193bbe9c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBaseUri.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBaseUri.java
@@ -101,7 +101,7 @@ private static ISequence<IAnyUriItem> executeOneArg(@NonNull IFunction function,
 
     ISequence<? extends INodeItem> arg = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
 
-    INodeItem item = FunctionUtils.getFirstItem(arg, true);
+    INodeItem item = arg.getFirstItem(true);
 
     return ISequence.of(fnBaseUri(item));
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBoolean.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBoolean.java
index 4d044095a..bafdf43b4 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBoolean.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnBoolean.java
@@ -29,7 +29,6 @@
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
 import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
-import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
 import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
 import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
 import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException;
@@ -109,7 +108,7 @@ public static IBooleanItem fnBoolean(@NonNull ISequence<?> sequence) {
    */
   public static boolean fnBooleanAsPrimitive(@NonNull ISequence<?> sequence) {
     boolean retval = false;
-    IItem first = FunctionUtils.getFirstItem(sequence, false);
+    IItem first = sequence.getFirstItem(false);
     if (first != null) {
       if (first instanceof INodeItem) {
         retval = true;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCeiling.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCeiling.java
index 215ede52b..7d847da3e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCeiling.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCeiling.java
@@ -79,7 +79,7 @@ private static ISequence<INumericItem> execute(
     ISequence<? extends INumericItem> sequence = FunctionUtils.asType(
         ObjectUtils.requireNonNull(arguments.get(0)));
 
-    INumericItem item = FunctionUtils.getFirstItem(sequence, true);
+    INumericItem item = sequence.getFirstItem(true);
     if (item == null) {
       return ISequence.empty(); // NOPMD - readability
     }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCompare.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCompare.java
index ad5fc26b6..f6fbf7516 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCompare.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnCompare.java
@@ -35,7 +35,6 @@
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.List;
 
@@ -80,11 +79,8 @@ private static ISequence<IIntegerItem> execute(
       @NonNull List<ISequence<?>> arguments,
       @NonNull DynamicContext dynamicContext,
       IItem focus) {
-    IStringItem comparand1 = FunctionUtils.getFirstItem(
-        FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0))), true);
-
-    IStringItem comparand2 = FunctionUtils.getFirstItem(
-        FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1))), true);
+    IStringItem comparand1 = FunctionUtils.asTypeOrNull(arguments.get(0).getFirstItem(true));
+    IStringItem comparand2 = FunctionUtils.asTypeOrNull(arguments.get(1).getFirstItem(true));
 
     ISequence<IIntegerItem> retval;
     if (comparand1 == null || comparand2 == null) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnConcat.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnConcat.java
index 56eaf357f..42594b5f9 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnConcat.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnConcat.java
@@ -29,7 +29,6 @@
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
 import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
-import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
 import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
 import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
@@ -87,7 +86,7 @@ private static ISequence<IStringItem> execute(
     return ISequence.of(concat(ObjectUtils.notNull(arguments.stream()
         .map(arg -> {
           assert arg != null;
-          return (IAnyAtomicItem) FunctionUtils.getFirstItem(arg, true);
+          return (IAnyAtomicItem) arg.getFirstItem(true);
         }))));
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnData.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnData.java
index f860e9bf2..54c2619ca 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnData.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnData.java
@@ -36,6 +36,7 @@
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAtomicValuedItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -126,11 +127,9 @@ private static ISequence<IAnyAtomicItem> executeOneArg(
    */
   @SuppressWarnings("null")
   @NonNull
-  public static ISequence<IAnyAtomicItem> fnData(@NonNull ISequence<?> sequence) {
-    @NonNull Stream<? extends IItem> stream = sequence.asStream();
-    return ISequence.of(stream.flatMap(x -> {
-      return Stream.of(fnDataItem(x));
-    }));
+  public static ISequence<IAnyAtomicItem> fnData(@NonNull ISequence<? extends IItem> sequence) {
+    return ISequence.of(sequence.stream()
+        .flatMap(FnData::atomize));
   }
 
   /**
@@ -145,13 +144,60 @@ public static ISequence<IAnyAtomicItem> fnData(@NonNull ISequence<?> sequence) {
   @NonNull
   public static IAnyAtomicItem fnDataItem(@NonNull IItem item) {
     IAnyAtomicItem retval = null;
-    if (item instanceof IAnyAtomicItem) {
-      retval = (IAnyAtomicItem) item;
-    } else if (item instanceof IAtomicValuedItem) {
+    if (item instanceof IAtomicValuedItem) {
       retval = ((IAtomicValuedItem) item).toAtomicItem();
     }
 
-    if (retval == null) {
+    if (retval != null) {
+      return retval;
+    }
+    throw new InvalidTypeFunctionException(InvalidTypeFunctionException.NODE_HAS_NO_TYPED_VALUE, item);
+  }
+
+  /**
+   * An implementation of
+   * <a href="https://www.w3.org/TR/xpath-31/#id-atomization">item
+   * atomization</a>.
+   *
+   * @param item
+   *          the item to atomize
+   * @return the atomized result
+   */
+  @NonNull
+  public static Stream<IAnyAtomicItem> fnDataItem(@NonNull IArrayItem<?> item) {
+    return ObjectUtils.notNull(item.stream().flatMap(member -> {
+      Stream<IAnyAtomicItem> result;
+      if (member instanceof IItem) {
+        result = atomize((IItem) member);
+      } else if (member instanceof ISequence) {
+        result = ((ISequence<?>) member).stream()
+            .flatMap(FnData::atomize);
+      } else {
+        throw new UnsupportedOperationException("array member not an item or sequence.");
+      }
+      return result;
+    }));
+  }
+
+  /**
+   * An implementation of
+   * <a href="https://www.w3.org/TR/xpath-31/#id-atomization">item
+   * atomization</a>.
+   *
+   * @param item
+   *          the item to atomize
+   * @return the atomized result
+   */
+  @NonNull
+  public static Stream<IAnyAtomicItem> atomize(@NonNull IItem item) {
+    Stream<IAnyAtomicItem> retval;
+    if (item instanceof IAnyAtomicItem) {
+      retval = ObjectUtils.notNull(Stream.of((IAnyAtomicItem) item));
+    } else if (item instanceof IAtomicValuedItem) {
+      retval = ObjectUtils.notNull(Stream.of(((IAtomicValuedItem) item).toAtomicItem()));
+    } else if (item instanceof IArrayItem) {
+      retval = fnDataItem((IArrayItem<?>) item);
+    } else {
       throw new InvalidTypeFunctionException(InvalidTypeFunctionException.NODE_HAS_NO_TYPED_VALUE, item);
     }
     return retval;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDoc.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDoc.java
index efb74b3a0..049e4b58e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDoc.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDoc.java
@@ -76,7 +76,7 @@ private static ISequence<IDocumentNodeItem> execute(@NonNull IFunction function,
       IItem focus) {
     ISequence<? extends IStringItem> arg = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
 
-    IStringItem item = FunctionUtils.getFirstItem(arg, true);
+    IStringItem item = arg.getFirstItem(true);
 
     return item == null ? ISequence.empty() : ISequence.of(fnDoc(item, dynamicContext));
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentUri.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentUri.java
index 2e02b919e..64c8f602f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentUri.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnDocumentUri.java
@@ -88,14 +88,9 @@ private static ISequence<IAnyUriItem> executeNoArg(@NonNull IFunction function,
 
     INodeItem item = FunctionUtils.requireTypeOrNull(INodeItem.class, focus);
 
-    ISequence<IAnyUriItem> retval;
-    if (item instanceof IDocumentNodeItem) {
-      IAnyUriItem uri = fnDocumentUri((IDocumentNodeItem) item);
-      retval = ISequence.of(uri);
-    } else {
-      retval = ISequence.empty();
-    }
-    return retval;
+    return item instanceof IDocumentNodeItem
+        ? ISequence.of(fnDocumentUri((IDocumentNodeItem) item))
+        : ISequence.empty();
   }
 
   @SuppressWarnings("unused")
@@ -107,18 +102,11 @@ private static ISequence<IAnyUriItem> executeOneArg(@NonNull IFunction function,
 
     ISequence<? extends INodeItem> arg = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
 
-    INodeItem item = FunctionUtils.getFirstItem(arg, true);
-
-    ISequence<IAnyUriItem> retval;
-    if (item == null) {
-      retval = ISequence.empty();
-    } else if (item instanceof IDocumentNodeItem) {
-      IAnyUriItem uri = fnDocumentUri((IDocumentNodeItem) item);
-      retval = ISequence.of(uri);
-    } else {
-      retval = ISequence.empty();
-    }
-    return retval;
+    INodeItem item = arg.getFirstItem(true);
+
+    return item instanceof IDocumentNodeItem
+        ? ISequence.of(fnDocumentUri((IDocumentNodeItem) item))
+        : ISequence.empty();
   }
 
   /**
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInsertBefore.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInsertBefore.java
index 0189f99a0..879a37f27 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInsertBefore.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnInsertBefore.java
@@ -84,11 +84,10 @@ private static ISequence<?> execute(@NonNull IFunction function,
       @NonNull DynamicContext dynamicContext,
       IItem focus) {
     ISequence<IItem> target = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
-    IIntegerItem position
-        = ObjectUtils.requireNonNull(
-            FunctionUtils.getFirstItem(FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1))), true));
+
+    IIntegerItem position = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
     ISequence<IItem> inserts = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(2)));
-    return ISequence.of(fnInsertBefore(target, position, inserts));
+    return ISequence.ofCollection(fnInsertBefore(target, position, inserts));
   }
 
   /**
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinMax.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinMax.java
index 0035a917e..8953bcad3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinMax.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnMinMax.java
@@ -101,7 +101,7 @@ private static ISequence<IAnyAtomicItem> executeMin(
     ISequence<? extends IAnyAtomicItem> sequence = FunctionUtils.asType(
         ObjectUtils.requireNonNull(arguments.get(0)));
 
-    return ISequence.of(min(sequence.asList()));
+    return ISequence.of(min(sequence.getValue()));
   }
 
   @SuppressWarnings("unused")
@@ -114,7 +114,7 @@ private static ISequence<IAnyAtomicItem> executeMax(
     ISequence<? extends IAnyAtomicItem> sequence = FunctionUtils.asType(
         ObjectUtils.requireNonNull(arguments.get(0)));
 
-    return ISequence.of(max(sequence.asList()));
+    return ISequence.of(max(sequence.getValue()));
   }
 
   /**
@@ -179,7 +179,7 @@ private static Stream<? extends IAnyAtomicItem> normalize(
       int size = resultingItems.size();
       if (counts.getOrDefault(IStringItem.class, 0) + counts.getOrDefault(IAnyUriItem.class, 0) == size) {
         stream = resultingItems.stream()
-            .map(item -> item.asStringItem());
+            .map(IAnyAtomicItem::asStringItem);
       } else if (counts.getOrDefault(IDecimalItem.class, 0) == size) {
         stream = resultingItems.stream()
             .map(item -> (IDecimalItem) item);
@@ -191,7 +191,7 @@ private static Stream<? extends IAnyAtomicItem> normalize(
           InvalidArgumentFunctionException.INVALID_ARGUMENT_TYPE,
           String.format("Values must all be of a single atomic type. Their types are '%s'.",
               FunctionUtils.getTypes(resultingItems).stream()
-                  .map(clazz -> clazz.getName())
+                  .map(Class::getName)
                   .collect(Collectors.joining(","))));
     }
     return stream;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPath.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPath.java
index 1242f9bbc..bd06bdd36 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPath.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnPath.java
@@ -121,7 +121,7 @@ private static ISequence<IStringItem> executeOneArg(@NonNull IFunction function,
    */
   @NonNull
   public static ISequence<IStringItem> fnPath(@NonNull ISequence<?> sequence) {
-    IItem item = FunctionUtils.getFirstItem(sequence, true);
+    IItem item = sequence.getFirstItem(true);
 
     ISequence<IStringItem> retval;
     if (item == null) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRemove.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRemove.java
index 9568d11d3..73f666bf2 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRemove.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRemove.java
@@ -79,10 +79,8 @@ private static ISequence<?> execute(@NonNull IFunction function,
       @NonNull DynamicContext dynamicContext,
       IItem focus) {
     ISequence<?> target = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
-    IIntegerItem position
-        = ObjectUtils.requireNonNull(
-            FunctionUtils.getFirstItem(FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1))), true));
-    return ISequence.of(fnRemove(target, position));
+    IIntegerItem position = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
+    return ISequence.ofCollection(fnRemove(target, position));
   }
 
   /**
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnResolveUri.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnResolveUri.java
index fbfe91ec3..210932977 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnResolveUri.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnResolveUri.java
@@ -102,7 +102,7 @@ private static ISequence<IAnyUriItem> executeOneArg(
       return ISequence.empty(); // NOPMD - readability
     }
 
-    IStringItem relativeString = FunctionUtils.getFirstItem(relativeSequence, true);
+    IStringItem relativeString = relativeSequence.getFirstItem(true);
     IAnyUriItem resolvedUri = null;
     if (relativeString != null) {
       resolvedUri = fnResolveUri(relativeString, null, dynamicContext);
@@ -143,7 +143,7 @@ private static ISequence<IAnyUriItem> executeTwoArg(
     }
 
     ISequence<? extends IStringItem> baseSequence = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1)));
-    IStringItem baseString = FunctionUtils.getFirstItem(baseSequence, true);
+    IStringItem baseString = baseSequence.getFirstItem(true);
 
     if (baseString == null) {
       throw new InvalidArgumentFunctionException(
@@ -152,7 +152,7 @@ private static ISequence<IAnyUriItem> executeTwoArg(
     }
     IAnyUriItem baseUri = IAnyUriItem.cast(baseString);
 
-    IStringItem relativeString = FunctionUtils.getFirstItem(relativeSequence, true);
+    IStringItem relativeString = relativeSequence.getFirstItem(true);
 
     IAnyUriItem resolvedUri = null;
     if (relativeString != null) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnReverse.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnReverse.java
index 5c6b39fa4..8fac330e3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnReverse.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnReverse.java
@@ -74,7 +74,7 @@ private static ISequence<?> execute(@NonNull IFunction function,
       @NonNull DynamicContext dynamicContext,
       IItem focus) {
     ISequence<?> target = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
-    return ISequence.of(fnReverse(target));
+    return ISequence.ofCollection(fnReverse(target));
   }
 
   /**
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRound.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRound.java
index 5edef5cf5..7b39a3643 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRound.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnRound.java
@@ -102,7 +102,7 @@ private static ISequence<INumericItem> executeOneArg(
     ISequence<? extends INumericItem> sequence = FunctionUtils.asType(
         ObjectUtils.requireNonNull(arguments.get(0)));
 
-    INumericItem item = FunctionUtils.getFirstItem(sequence, true);
+    INumericItem item = sequence.getFirstItem(true);
     if (item == null) {
       return ISequence.empty(); // NOPMD - readability
     }
@@ -120,15 +120,12 @@ private static ISequence<INumericItem> executeTwoArg(
     ISequence<? extends INumericItem> sequence = FunctionUtils.asType(
         ObjectUtils.requireNonNull(arguments.get(0)));
 
-    INumericItem item = FunctionUtils.getFirstItem(sequence, true);
+    INumericItem item = sequence.getFirstItem(true);
     if (item == null) {
       return ISequence.empty(); // NOPMD - readability
     }
 
-    IIntegerItem precision = FunctionUtils.asType(
-        FunctionUtils.requireFirstItem(
-            ObjectUtils.requireNonNull(arguments.get(1)),
-            true));
+    IIntegerItem precision = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
 
     return ISequence.of(item.round(precision));
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStartsWith.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStartsWith.java
index 33320a005..43faba83d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStartsWith.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStartsWith.java
@@ -35,7 +35,6 @@
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.List;
 
@@ -48,6 +47,9 @@ public final class FnStartsWith {
   static final IFunction SIGNATURE = IFunction.builder()
       .name("starts-with")
       .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS)
+      .deterministic()
+      .contextDependent()
+      .focusIndependent()
       .argument(IArgument.builder()
           .name("arg1").type(IStringItem.class)
           .zeroOrOne()
@@ -68,10 +70,9 @@ private static ISequence<IBooleanItem> execute(@NonNull IFunction function,
       @NonNull List<ISequence<?>> arguments,
       @NonNull DynamicContext dynamicContext,
       IItem focus) {
-    IStringItem arg1 = FunctionUtils.getFirstItem(
-        FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0))), true);
-    IStringItem arg2 = FunctionUtils.getFirstItem(
-        FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1))), true);
+    IStringItem arg1 = FunctionUtils.asTypeOrNull(arguments.get(0).getFirstItem(true));
+
+    IStringItem arg2 = FunctionUtils.asTypeOrNull(arguments.get(1).getFirstItem(true));
 
     return ISequence.of(fnStartsWith(arg1, arg2));
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStaticBaseUri.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStaticBaseUri.java
index 1fc6a1b73..9e5565fdf 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStaticBaseUri.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnStaticBaseUri.java
@@ -46,6 +46,9 @@ public final class FnStaticBaseUri {
   static final IFunction SIGNATURE = IFunction.builder()
       .name("static-base-uri")
       .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS)
+      .deterministic()
+      .contextDependent()
+      .focusIndependent()
       .argument(IArgument.builder()
           .name("arg1")
           .type(IStringItem.class)
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSum.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSum.java
index 93c418e83..2275c7ee4 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSum.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnSum.java
@@ -105,7 +105,7 @@ private static ISequence<IAnyAtomicItem> executeOneArg(
     ISequence<? extends IAnyAtomicItem> sequence = FunctionUtils.asType(
         ObjectUtils.requireNonNull(arguments.get(0)));
 
-    return ISequence.of(sum(sequence.asList(), IIntegerItem.ZERO));
+    return ISequence.of(sum(sequence.getValue(), IIntegerItem.ZERO));
   }
 
   @SuppressWarnings("unused")
@@ -115,15 +115,11 @@ private static ISequence<IAnyAtomicItem> executeTwoArg(
       @NonNull List<ISequence<?>> arguments,
       @NonNull DynamicContext dynamicContext,
       IItem focus) {
-    ISequence<? extends IAnyAtomicItem> sequence = FunctionUtils.asType(
-        ObjectUtils.requireNonNull(arguments.get(0)));
+    ISequence<? extends IAnyAtomicItem> sequence = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
 
-    IAnyAtomicItem zero = FunctionUtils.getFirstItem(
-        FunctionUtils.asType(
-            ObjectUtils.requireNonNull(arguments.get(1))),
-        true);
+    IAnyAtomicItem zero = FunctionUtils.asTypeOrNull(arguments.get(1).getFirstItem(true));
 
-    return ISequence.of(sum(sequence.asList(), zero));
+    return ISequence.of(sum(sequence.getValue(), zero));
   }
 
   /**
@@ -208,7 +204,7 @@ public static IAnyAtomicItem sum(
           InvalidArgumentFunctionException.INVALID_ARGUMENT_TYPE,
           String.format("Values must all be of type '%s'.",
               OperationFunctions.AGGREGATE_MATH_TYPES.stream()
-                  .map(type -> type.getName())
+                  .map(Class::getName)
                   .collect(CustomCollectors.joiningWithOxfordComma(","))));
     }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTail.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTail.java
index 1f07291d6..0ecb66551 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTail.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/FnTail.java
@@ -73,7 +73,7 @@ private static ISequence<?> execute(@NonNull IFunction function,
       @NonNull DynamicContext dynamicContext,
       IItem focus) {
     ISequence<?> items = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
-    return ISequence.of(fnTail(items));
+    return ISequence.ofCollection(fnTail(items));
   }
 
   /**
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContains.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContains.java
new file mode 100644
index 000000000..b9639d970
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContains.java
@@ -0,0 +1,102 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class MapContains {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("contains")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_MAP)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("map")
+          .type(IMapItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("key")
+          .type(IAnyAtomicItem.class)
+          .one()
+          .build())
+      .returnType(IBooleanItem.class)
+      .returnOne()
+      .functionHandler(MapContains::execute)
+      .build();
+
+  private MapContains() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static ISequence<?> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IMapItem<?> map = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0).getFirstItem(true)));
+    IAnyAtomicItem key = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
+
+    return IBooleanItem.valueOf(contains(map, key)).asSequence();
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-map-contains">map:contains</a>.
+   *
+   * @param <V>
+   *          the type of items in the given Metapath map
+   * @param map
+   *          the map of Metapath items that is the target of retrieval
+   * @param key
+   *          the key for the item to retrieve
+   * @return {@code true} if the key exists in the map, or {@code false} otherwise
+   */
+  public static <V extends ICollectionValue> boolean contains(
+      @NonNull IMapItem<V> map,
+      @NonNull IAnyAtomicItem key) {
+    return map.get(key.asMapKey()) != null;
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntry.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntry.java
new file mode 100644
index 000000000..c1e018a3e
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntry.java
@@ -0,0 +1,102 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class MapEntry {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("entry")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_MAP)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("key")
+          .type(IAnyAtomicItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("item")
+          .type(IItem.class)
+          .zeroOrMore()
+          .build())
+      .returnType(IItem.class)
+      .returnOne()
+      .functionHandler(MapEntry::execute)
+      .build();
+
+  private MapEntry() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <T extends ICollectionValue> ISequence<IMapItem<T>> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IAnyAtomicItem key = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0).getFirstItem(true)));
+    @SuppressWarnings("unchecked") T value = (T) arguments.get(1).toCollectionValue();
+
+    return entry(key, value).asSequence();
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-map-entry">map:entry</a>.
+   *
+   * @param <T>
+   *          the type of items in the given Metapath map
+   * @param key
+   *          the Metapath map entry key
+   * @param value
+   *          the Metapath map entry value
+   * @return a new array containing the modification
+   */
+  @NonNull
+  public static <T extends ICollectionValue> IMapItem<T> entry(
+      @NonNull IAnyAtomicItem key,
+      @NonNull T value) {
+    return IMapItem.ofEntries(IMapItem.entry(key, value));
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFind.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFind.java
new file mode 100644
index 000000000..b5a4b39c7
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFind.java
@@ -0,0 +1,180 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class MapFind {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("find")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_MAP)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("input")
+          .type(IItem.class)
+          .zeroOrMore()
+          .build())
+      .argument(IArgument.builder()
+          .name("key")
+          .type(IAnyAtomicItem.class)
+          .one()
+          .build())
+      .returnType(IArrayItem.class)
+      .returnOne()
+      .functionHandler(MapFind::execute)
+      .build();
+
+  private MapFind() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static ISequence<?> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    ISequence<?> input = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
+    IAnyAtomicItem key = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
+
+    return ISequence.of(IArrayItem.ofCollection(
+        ObjectUtils.notNull(find((Collection<? extends IItem>) input, key)
+            .collect(Collectors.toList()))));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-map-find">map:find</a>.
+   *
+   * @param items
+   *          the item sequence to search for key matches
+   * @param key
+   *          the key for the item to retrieve
+   * @return the retrieved item
+   */
+  @NonNull
+  public static Stream<ICollectionValue> find(
+      @NonNull Collection<? extends IItem> items,
+      @NonNull IAnyAtomicItem key) {
+    return ObjectUtils.notNull(items.stream()
+        // handle item
+        .flatMap(item -> find(ObjectUtils.notNull(item), key)));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-map-find">map:find</a>.
+   *
+   * @param item
+   *          the item to search for key matches
+   * @param key
+   *          the key for the item to retrieve
+   * @return the retrieved item
+   */
+  @NonNull
+  public static Stream<ICollectionValue> find(
+      @NonNull IItem item,
+      @NonNull IAnyAtomicItem key) {
+    Stream<ICollectionValue> retval;
+    if (item instanceof IArrayItem) {
+      IArrayItem<?> array = (IArrayItem<?>) item;
+      retval = ObjectUtils.notNull(array.stream()
+          // handle array values
+          .flatMap(value -> find(ObjectUtils.notNull(value), key)));
+    } else if (item instanceof IMapItem) {
+      IMapItem<?> map = (IMapItem<?>) item;
+      // handle map
+      retval = find(map, key);
+    } else {
+      // do nothing
+      retval = ObjectUtils.notNull(Stream.empty());
+    }
+    return retval;
+  }
+
+  @NonNull
+  private static Stream<ICollectionValue> find(
+      @NonNull ICollectionValue value,
+      @NonNull IAnyAtomicItem key) {
+    Stream<ICollectionValue> retval;
+    if (value instanceof ISequence) {
+      ISequence<?> sequence = (ISequence<?>) value;
+      // handle sequence items
+      retval = find((Collection<? extends IItem>) sequence, key);
+    } else {
+      // handle item
+      retval = find((IItem) value, key);
+    }
+    return retval;
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-map-find">map:find</a>.
+   * <p>
+   * This is a specialized method for processing an item that is a map item, which
+   * can be searched for a key in a much more efficient way.
+   *
+   * @param item
+   *          the item to search for key matches
+   * @param key
+   *          the key for the item to retrieve
+   * @return the retrieved item
+   */
+  @NonNull
+  public static Stream<ICollectionValue> find(
+      @NonNull IMapItem<?> item,
+      @NonNull IAnyAtomicItem key) {
+    return ObjectUtils.notNull(Stream.concat(
+        // add matching value, if it exists
+        Stream.ofNullable(MapGet.get(item, key)),
+        item.values().stream()
+            // handle map values
+            .flatMap(value -> find(ObjectUtils.notNull(value), key))));
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGet.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGet.java
new file mode 100644
index 000000000..60c69716d
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGet.java
@@ -0,0 +1,104 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+public final class MapGet {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("get")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_MAP)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("map")
+          .type(IMapItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("key")
+          .type(IAnyAtomicItem.class)
+          .one()
+          .build())
+      .returnType(IItem.class)
+      .returnZeroOrOne()
+      .functionHandler(MapGet::execute)
+      .build();
+
+  private MapGet() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static ISequence<?> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IMapItem<?> map = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0).getFirstItem(true)));
+    IAnyAtomicItem key = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
+
+    ICollectionValue value = get(map, key);
+    return value == null ? ISequence.empty() : value.asSequence();
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-map-get">map:get</a>.
+   *
+   * @param <V>
+   *          the type of items in the given Metapath map
+   * @param map
+   *          the map of Metapath items that is the target of retrieval
+   * @param key
+   *          the key for the item to retrieve
+   * @return the retrieved item
+   */
+  @Nullable
+  public static <V extends ICollectionValue> V get(
+      @NonNull IMapItem<V> map,
+      @NonNull IAnyAtomicItem key) {
+    return map.get(key.asMapKey());
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeys.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeys.java
new file mode 100644
index 000000000..c64b55794
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeys.java
@@ -0,0 +1,94 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class MapKeys {
+  @NonNull
+  static final IFunction SIGNATURE = IFunction.builder()
+      .name("keys")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_MAP)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("map")
+          .type(IMapItem.class)
+          .one()
+          .build())
+      .returnType(IAnyAtomicItem.class)
+      .returnZeroOrMore()
+      .functionHandler(MapKeys::execute)
+      .build();
+
+  private MapKeys() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static ISequence<IAnyAtomicItem> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IMapItem<?> map = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0).getFirstItem(true)));
+
+    return ISequence.of(keys(map));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-map-keys">map:keys</a>.
+   *
+   * @param map
+   *          the map to get the keys for
+   * @return a stream of map keys
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static Stream<IAnyAtomicItem> keys(@NonNull Map<IMapKey, ?> map) {
+    return map.keySet().stream()
+        .map(IMapKey::getKey);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMerge.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMerge.java
new file mode 100644
index 000000000..8b6a9dd76
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMerge.java
@@ -0,0 +1,228 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.function.JsonFunctionException;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.CustomCollectors;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+public final class MapMerge {
+  private static final Random RANDOM = new Random();
+  private static final IMapKey DUPLICATES_OPTION = IStringItem.valueOf("duplicates").asMapKey();
+
+  @NonNull
+  static final IFunction SIGNATURE_ONE_ARG = IFunction.builder()
+      .name("merge")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_MAP)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("maps")
+          .type(IMapItem.class)
+          .zeroOrMore()
+          .build())
+      .returnType(IMapItem.class)
+      .returnOne()
+      .functionHandler(MapMerge::executeOneArg)
+      .build();
+
+  @NonNull
+  static final IFunction SIGNATURE_TWO_ARG = IFunction.builder()
+      .name("merge")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_MAP)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("maps")
+          .type(IMapItem.class)
+          .zeroOrMore()
+          .build())
+      .argument(IArgument.builder()
+          .name("options")
+          .type(IMapItem.class)
+          .one()
+          .build())
+      .returnType(IMapItem.class)
+      .returnOne()
+      .functionHandler(MapMerge::executeTwoArg)
+      .build();
+
+  private enum Duplicates {
+    REJECT("reject", (key, v1, v2) -> {
+      throw new JsonFunctionException(
+          JsonFunctionException.DUPLICATE_KEYS,
+          String.format("Duplicate key '%s' not allowed.", key.getKey().asString()));
+    }),
+
+    USE_FIRST("use-first", (key, v1, v2) -> v1),
+    USE_LAST("use-last", (key, v1, v2) -> v2),
+    USE_ANY("use-any", (key, v1, v2) -> RANDOM.nextBoolean() ? v1 : v2),
+    @SuppressWarnings("null")
+    COMBINE("combine", (key, v1, v2) -> {
+      return Stream.concat(
+          v1.asSequence().stream(),
+          v2.asSequence().stream()).collect(ISequence.toSequence());
+    });
+
+    private static final Map<String, Duplicates> BY_NAME;
+
+    @NonNull
+    private final String name;
+    @NonNull
+    private final CustomCollectors.DuplicateHandler<IMapKey, ICollectionValue> duplicateHander;
+
+    static {
+      @SuppressWarnings("PMD.UseConcurrentHashMap") Map<String, Duplicates> map = new HashMap<>();
+      for (Duplicates value : values()) {
+        map.put(value.getName(), value);
+      }
+      BY_NAME = Collections.unmodifiableMap(map);
+    }
+
+    @Nullable
+    public static Duplicates lookup(@NonNull String name) {
+      return BY_NAME.get(name);
+    }
+
+    Duplicates(@NonNull String name,
+        @NonNull CustomCollectors.DuplicateHandler<IMapKey, ICollectionValue> duplicateHander) {
+      this.name = name;
+      this.duplicateHander = duplicateHander;
+    }
+
+    public String getName() {
+      return name;
+    }
+
+    public CustomCollectors.DuplicateHandler<IMapKey, ICollectionValue> getDuplicateHander() {
+      return duplicateHander;
+    }
+  }
+
+  private MapMerge() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static ISequence<?> executeOneArg(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    ISequence<IMapItem<?>> maps = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
+
+    return ISequence.of(merge(maps, CollectionUtil.emptyMap()));
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static ISequence<?> executeTwoArg(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    ISequence<IMapItem<?>> maps = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
+    IMapItem<?> options = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
+
+    return ISequence.of(merge(maps, options));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-map-merge">map:merge</a>.
+   *
+   * @param maps
+   *          a collection of maps to merge
+   * @param options
+   *          settings that affect the merge behavior
+   * @return a map containing the merged entries
+   */
+  @SuppressWarnings({ "null", "PMD.OnlyOneReturn" })
+  @NonNull
+  public static IMapItem<?> merge(@NonNull Collection<? extends Map<IMapKey, ? extends ICollectionValue>> maps,
+      @NonNull Map<IMapKey, ? extends ICollectionValue> options) {
+    if (maps.isEmpty()) {
+      return IMapItem.empty();
+    }
+
+    // handle the "duplicates" option
+    ICollectionValue duplicatesOption = options.get(DUPLICATES_OPTION);
+
+    Duplicates duplicates;
+    if (duplicatesOption == null) {
+      // default option
+      duplicates = Duplicates.USE_FIRST;
+    } else {
+      // resolve the provided option
+      IAnyAtomicItem atomicValue = FnData.fnData(duplicatesOption.asSequence()).getFirstItem(true);
+      if (atomicValue == null) {
+        throw new JsonFunctionException(
+            JsonFunctionException.INVALID_OPTION,
+            String.format("Missing '%s' option value.", DUPLICATES_OPTION.getKey().asString()));
+      }
+      String duplicatesValue = IStringItem.cast(atomicValue).asString();
+      duplicates = Duplicates.lookup(duplicatesValue);
+      if (duplicates == null) {
+        throw new JsonFunctionException(
+            JsonFunctionException.INVALID_OPTION,
+            String.format("Invalid '%s' option value '%s'.", DUPLICATES_OPTION.getKey().asString(), duplicatesValue));
+      }
+    }
+
+    // merge the maps
+    return IMapItem.ofCollection(maps.stream()
+        .flatMap(map -> map.entrySet().stream())
+        // collect the entries into a new map
+        .collect(CustomCollectors.toMap(Map.Entry::getKey, Map.Entry::getValue, duplicates.getDuplicateHander(),
+            HashMap::new)));
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPut.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPut.java
new file mode 100644
index 000000000..a621d6cec
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPut.java
@@ -0,0 +1,117 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class MapPut {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("put")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_MAP)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("map")
+          .type(IMapItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("key")
+          .type(IAnyAtomicItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("value")
+          .type(IItem.class)
+          .zeroOrMore()
+          .build())
+      .returnType(IMapItem.class)
+      .returnOne()
+      .functionHandler(MapPut::execute)
+      .build();
+
+  private MapPut() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <V extends ICollectionValue> ISequence<?> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IMapItem<V> map = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0).getFirstItem(true)));
+    IAnyAtomicItem key = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1).getFirstItem(true)));
+    @SuppressWarnings("unchecked") V value = (V) ObjectUtils.requireNonNull(arguments.get(2)).toCollectionValue();
+
+    return put(map, key, value).asSequence();
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-map-put">map:put</a>.
+   *
+   * @param <V>
+   *          the type of items in the given Metapath map
+   * @param map
+   *          the map of Metapath items that is to be modified
+   * @param key
+   *          the key for the value to add to the map
+   * @param value
+   *          the value to add to the map
+   * @return the modified map
+   */
+  @NonNull
+  public static <V extends ICollectionValue> IMapItem<V> put(
+      @NonNull IMapItem<V> map,
+      @NonNull IAnyAtomicItem key,
+      @NonNull V value) {
+    @SuppressWarnings("PMD.UseConcurrentHashMap") Map<IMapKey, V> copy = new HashMap<>(map);
+    copy.put(key.asMapKey(), value);
+
+    return IMapItem.ofCollection(copy);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemove.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemove.java
new file mode 100644
index 000000000..313c939b4
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemove.java
@@ -0,0 +1,115 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public final class MapRemove {
+  @NonNull
+  public static final IFunction SIGNATURE = IFunction.builder()
+      .name("remove")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_MAP)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("map")
+          .type(IMapItem.class)
+          .one()
+          .build())
+      .argument(IArgument.builder()
+          .name("keys")
+          .type(IAnyAtomicItem.class)
+          .zeroOrMore()
+          .build())
+      .returnType(IMapItem.class)
+      .returnOne()
+      .functionHandler(MapRemove::execute)
+      .build();
+
+  private MapRemove() {
+    // disable construction
+  }
+
+  @SuppressWarnings("unused")
+  @NonNull
+  private static <V extends ICollectionValue> ISequence<?> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IMapItem<V> map = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0).getFirstItem(true)));
+    ISequence<? extends IAnyAtomicItem> keys = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1)));
+
+    return ISequence.of(removeItems(map, keys));
+  }
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-map-remove">map:remove</a>.
+   *
+   * @param <V>
+   *          the type of items in the given Metapath map
+   * @param map
+   *          the map of Metapath items that is to be modified
+   * @param keys
+   *          the keys to remove from the map
+   * @return the modified map
+   */
+  @NonNull
+  public static <V extends ICollectionValue> IMapItem<V> removeItems(
+      @NonNull IMapItem<V> map,
+      @NonNull Collection<? extends IAnyAtomicItem> keys) {
+    Set<IMapKey> keySet = keys.stream()
+        .map(IAnyAtomicItem::asMapKey)
+        .collect(Collectors.toSet());
+
+    Map<IMapKey, V> remaining = ObjectUtils.notNull(map.entrySet().stream()
+        .filter(entry -> !keySet.contains(entry.getKey()))
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
+
+    return IMapItem.ofCollection(remaining);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSize.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSize.java
new file mode 100644
index 000000000..6f9c6ffa3
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSize.java
@@ -0,0 +1,80 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.List;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class MapSize {
+  @NonNull
+  static final IFunction SIGNATURE = IFunction.builder()
+      .name("size")
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_MAP)
+      .deterministic()
+      .contextIndependent()
+      .focusIndependent()
+      .argument(IArgument.builder()
+          .name("map")
+          .type(IMapItem.class)
+          .one()
+          .build())
+      .returnType(IIntegerItem.class)
+      .returnOne()
+      .functionHandler(MapSize::execute)
+      .build();
+
+  /**
+   * An implementation of XPath 3.1 <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#func-map-size">map:size</a>.
+   *
+   * @param array
+   *          the arrays to join
+   * @return a new combined array
+   */
+  @SuppressWarnings("unused")
+  @NonNull
+  private static ISequence<IIntegerItem> execute(@NonNull IFunction function,
+      @NonNull List<ISequence<?>> arguments,
+      @NonNull DynamicContext dynamicContext,
+      IItem focus) {
+    IMapItem<?> map = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0).getFirstItem(true)));
+
+    return ISequence.of(IIntegerItem.valueOf(map.size()));
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpRecurseDepth.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpRecurseDepth.java
index 5e3e83139..d8bfdd423 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpRecurseDepth.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/MpRecurseDepth.java
@@ -105,7 +105,7 @@ private static ISequence<INodeItem> executeOneArg(
     ISequence<INodeItem> initalContext = ISequence.of(FunctionUtils.requireType(INodeItem.class, focus));
 
     ISequence<? extends IStringItem> arg = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
-    IStringItem recursionPath = FunctionUtils.requireFirstItem(arg, true);
+    IStringItem recursionPath = ObjectUtils.requireNonNull(arg.getFirstItem(true));
 
     return recurseDepth(initalContext, recursionPath, dynamicContext);
   }
@@ -121,7 +121,7 @@ private static ISequence<INodeItem> executeTwoArg(
     ISequence<INodeItem> initalContext = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(0)));
 
     ISequence<? extends IStringItem> arg = FunctionUtils.asType(ObjectUtils.requireNonNull(arguments.get(1)));
-    IStringItem recursionPath = FunctionUtils.requireFirstItem(arg, true);
+    IStringItem recursionPath = ObjectUtils.requireNonNull(arg.getFirstItem(true));
 
     return recurseDepth(initalContext, recursionPath, dynamicContext);
   }
@@ -162,12 +162,12 @@ public static ISequence<INodeItem> recurseDepth(
       @NonNull MetapathExpression recursionMetapath,
       @NonNull DynamicContext dynamicContext) {
 
-    return ISequence.of(ObjectUtils.notNull(initialContext.asStream()
+    return ISequence.of(ObjectUtils.notNull(initialContext.stream()
         .flatMap(item -> {
           @NonNull ISequence<INodeItem> metapathResult
               = recursionMetapath.evaluate(item, dynamicContext);
           ISequence<INodeItem> result = recurseDepth(metapathResult, recursionMetapath, dynamicContext);
-          return ObjectUtils.notNull(Stream.concat(result.asStream(), Stream.of(item)));
+          return ObjectUtils.notNull(Stream.concat(result.stream(), Stream.of(item)));
         })));
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/NumericFunction.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/NumericFunction.java
index 09244ee9f..076bb9064 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/NumericFunction.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/NumericFunction.java
@@ -63,6 +63,9 @@ static IFunction signature(@NonNull String namespace, @NonNull String name, @Non
     return IFunction.builder()
         .name(name)
         .namespace(namespace)
+        .deterministic()
+        .contextIndependent()
+        .focusIndependent()
         .argument(IArgument.builder()
             .name("arg1")
             .type(INumericItem.class)
@@ -103,7 +106,7 @@ public ISequence<INumericItem> execute(@NonNull IFunction function,
       return ISequence.empty(); // NOPMD - readability
     }
 
-    INumericItem item = FunctionUtils.getFirstItem(sequence, true);
+    INumericItem item = sequence.getFirstItem(true);
     if (item == null) {
       return ISequence.empty(); // NOPMD - readability
     }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractArrayItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractArrayItem.java
new file mode 100644
index 000000000..ee02e2a45
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractArrayItem.java
@@ -0,0 +1,112 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.impl;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.ISequenceType;
+import gov.nist.secauto.metaschema.core.metapath.function.Occurrence;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public abstract class AbstractArrayItem<ITEM extends ICollectionValue>
+    extends ImmutableCollections.AbstractImmutableDelegatedList<ITEM>
+    implements IArrayItem<ITEM> {
+  @NonNull
+  public static final QName QNAME = new QName("array");
+  @NonNull
+  public static final Set<FunctionProperty> PROPERTIES = ObjectUtils.notNull(
+      EnumSet.of(FunctionProperty.DETERMINISTIC));
+  @NonNull
+  public static final List<IArgument> ARGUMENTS = ObjectUtils.notNull(List.of(
+      IArgument.builder().name("position").type(IIntegerItem.class).one().build()));
+  @NonNull
+  public static final ISequenceType RESULT = ISequenceType.of(IAnyAtomicItem.class, Occurrence.ZERO_OR_ONE);
+
+  @SuppressWarnings({ "rawtypes", "unchecked" })
+  @NonNull
+  private static final IArrayItem<?> EMPTY = new ArrayItemN<>();
+
+  /**
+   * Get an immutable array item that is empty.
+   *
+   * @param <T>
+   *          the item Java type
+   * @return the empty array item
+   */
+  @SuppressWarnings("unchecked")
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> empty() {
+    return (IArrayItem<T>) EMPTY;
+  }
+
+  @Override
+  public ISequence<?> execute(List<ISequence<?>> arguments, DynamicContext dynamicContext,
+      ISequence<?> focus) {
+    ISequence<? extends IIntegerItem> arg = FunctionUtils.asType(
+        ObjectUtils.notNull(arguments.get(0)));
+
+    IIntegerItem position = arg.getFirstItem(true);
+    if (position == null) {
+      return ISequence.empty(); // NOPMD - readability
+    }
+
+    int index = position.asInteger().intValueExact() - 1;
+    ICollectionValue result = getValue().get(index);
+    return result.asSequence();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(getValue());
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    return other == this
+        || other instanceof IArrayItem && getValue().equals(((IArrayItem<?>) other).getValue());
+  }
+
+  @Override
+  public String asString() {
+    return ObjectUtils.notNull(toString());
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractKeySpecifier.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractKeySpecifier.java
new file mode 100644
index 000000000..69cf6052f
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractKeySpecifier.java
@@ -0,0 +1,300 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.impl;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.InvalidTypeMetapathException;
+import gov.nist.secauto.metaschema.core.metapath.cst.IExpression;
+import gov.nist.secauto.metaschema.core.metapath.function.library.ArrayGet;
+import gov.nist.secauto.metaschema.core.metapath.function.library.FnData;
+import gov.nist.secauto.metaschema.core.metapath.function.library.MapGet;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.ArrayException;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IKeySpecifier;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A common base class for all key specifiers.
+ */
+public abstract class AbstractKeySpecifier implements IKeySpecifier {
+  @Override
+  public Stream<? extends ICollectionValue> lookup(
+      @NonNull IItem targetItem,
+      @NonNull DynamicContext dynamicContext,
+      @NonNull ISequence<?> focus) {
+    Stream<? extends ICollectionValue> result;
+    if (targetItem instanceof IArrayItem) {
+      result = lookupInArray((IArrayItem<?>) targetItem, dynamicContext, focus);
+    } else if (targetItem instanceof IMapItem) {
+      result = lookupInMap((IMapItem<?>) targetItem, dynamicContext, focus);
+    } else {
+      throw new InvalidTypeMetapathException(targetItem,
+          String.format("Item type '%s' is not an array or map.", targetItem.getClass().getName()));
+    }
+    return result;
+  }
+
+  /**
+   * A dispatch method intended to handle lookups within an array item.
+   *
+   * @param targetItem
+   *          the item to query
+   * @param dynamicContext
+   *          the dynamic context to use for expression evaluation
+   * @param focus
+   *          the focus item for expression evaluation
+   * @return a stream of collection values matching this key specifier
+   */
+  @NonNull
+  protected abstract Stream<? extends ICollectionValue> lookupInArray(
+      @NonNull IArrayItem<?> targetItem,
+      @NonNull DynamicContext dynamicContext,
+      @NonNull ISequence<?> focus);
+
+  /**
+   * A dispatch method intended to handle lookups within a map item.
+   *
+   * @param targetItem
+   *          the item to query
+   * @param dynamicContext
+   *          the dynamic context to use for expression evaluation
+   * @param focus
+   *          the focus item for expression evaluation
+   * @return a stream of collection values matching this key specifier
+   */
+  @NonNull
+  protected abstract Stream<? extends ICollectionValue> lookupInMap(
+      @NonNull IMapItem<?> targetItem,
+      @NonNull DynamicContext dynamicContext,
+      @NonNull ISequence<?> focus);
+
+  /**
+   * Construct a new key specifier supporting name-based lookups.
+   *
+   * @param name
+   *          the name to use for lookups
+   * @return the key specifier
+   */
+  @NonNull
+  public static IKeySpecifier newNameKeySpecifier(@NonNull String name) {
+    return new AbstractKeySpecifier.NcNameKeySpecifier(name);
+  }
+
+  /**
+   * Construct a new key specifier supporting integer-based lookups.
+   *
+   * @param integer
+   *          the integer to use for lookups
+   * @return the key specifier
+   */
+  @NonNull
+  public static IKeySpecifier newIntegerLiteralKeySpecifier(@NonNull IIntegerItem integer) {
+    return new AbstractKeySpecifier.IntegerLiteralKeySpecifier(integer);
+  }
+
+  /**
+   * Construct a new key specifier supporting wildcard lookups.
+   *
+   * @return the key specifier
+   */
+  @NonNull
+  public static IKeySpecifier newWildcardKeySpecifier() {
+    return new AbstractKeySpecifier.WildcardKeySpecifier();
+  }
+
+  /**
+   * Construct a new key specifier supporting key-based lookups.
+   *
+   * @param keyExpression
+   *          the expression used to get a key to use for lookups
+   * @return the key specifier
+   */
+  @NonNull
+  public static IKeySpecifier newParenthesizedExprKeySpecifier(@NonNull IExpression keyExpression) {
+    return new AbstractKeySpecifier.ParenthesizedExprKeySpecifier(keyExpression);
+  }
+
+  private static class NcNameKeySpecifier
+      extends AbstractKeySpecifier {
+    @NonNull
+    private final String name;
+
+    public NcNameKeySpecifier(@NonNull String name) {
+      this.name = name;
+    }
+
+    @NonNull
+    public String getName() {
+      return name;
+    }
+
+    @Override
+    protected Stream<? extends IItem> lookupInArray(
+        IArrayItem<?> targetItem,
+        DynamicContext dynamicContext,
+        ISequence<?> focus) {
+      throw new InvalidTypeMetapathException(targetItem,
+          String.format("A name-based lookup '%s' is not appropriate for an array.", getName()));
+    }
+
+    @Override
+    protected Stream<? extends ICollectionValue> lookupInMap(
+        IMapItem<?> targetItem,
+        DynamicContext dynamicContext,
+        ISequence<?> focus) {
+      return ObjectUtils.notNull(Stream.ofNullable(MapGet.get(targetItem, IStringItem.valueOf(name))));
+    }
+  }
+
+  private static class IntegerLiteralKeySpecifier
+      extends AbstractKeySpecifier {
+    private final int index;
+
+    public IntegerLiteralKeySpecifier(@NonNull IIntegerItem literal) {
+      index = literal.asInteger().intValueExact();
+    }
+
+    @Override
+    protected Stream<? extends ICollectionValue> lookupInArray(
+        IArrayItem<?> targetItem,
+        DynamicContext dynamicContext,
+        ISequence<?> focus) {
+      try {
+        return ObjectUtils.notNull(Stream.ofNullable(ArrayGet.get(targetItem, index)));
+      } catch (IndexOutOfBoundsException ex) {
+        throw new ArrayException(
+            ArrayException.INDEX_OUT_OF_BOUNDS,
+            String.format("The index '%d' is outside the range of values for the array size '%d'.",
+                index + 1,
+                targetItem.size()),
+            ex);
+      }
+    }
+
+    @Override
+    protected Stream<? extends ICollectionValue> lookupInMap(
+        IMapItem<?> targetItem,
+        DynamicContext dynamicContext,
+        ISequence<?> focus) {
+      return ObjectUtils.notNull(Stream.ofNullable(MapGet.get(targetItem, IIntegerItem.valueOf(index))));
+    }
+  }
+
+  private static class WildcardKeySpecifier
+      extends AbstractKeySpecifier {
+
+    public WildcardKeySpecifier() {
+      // do nothing
+    }
+
+    @Override
+    protected Stream<? extends ICollectionValue> lookupInArray(
+        IArrayItem<?> targetItem,
+        DynamicContext dynamicContext,
+        ISequence<?> focus) {
+      return ObjectUtils.notNull(targetItem.stream());
+    }
+
+    @Override
+    protected Stream<? extends ICollectionValue> lookupInMap(
+        IMapItem<?> targetItem,
+        DynamicContext dynamicContext,
+        ISequence<?> focus) {
+      return ObjectUtils.notNull(targetItem.values().stream());
+    }
+  }
+
+  private static class ParenthesizedExprKeySpecifier
+      extends AbstractKeySpecifier {
+    @NonNull
+    private final IExpression keyExpression;
+
+    public ParenthesizedExprKeySpecifier(@NonNull IExpression keyExpression) {
+      this.keyExpression = keyExpression;
+    }
+
+    public IExpression getKeyExpression() {
+      return keyExpression;
+    }
+
+    @Override
+    protected Stream<ICollectionValue> lookupInArray(
+        IArrayItem<?> targetItem,
+        DynamicContext dynamicContext,
+        ISequence<?> focus) {
+      ISequence<IAnyAtomicItem> keys = FnData.fnData(getKeyExpression().accept(dynamicContext, focus));
+
+      return ObjectUtils.notNull(keys.stream()
+          .flatMap(key -> {
+            if (key instanceof IIntegerItem) {
+              int index = ((IIntegerItem) key).asInteger().intValueExact();
+              try {
+                return Stream.ofNullable(ArrayGet.get(targetItem, index));
+              } catch (IndexOutOfBoundsException ex) {
+                throw new ArrayException(
+                    ArrayException.INDEX_OUT_OF_BOUNDS,
+                    String.format("The index %d is outside the range of values for the array size '%d'.",
+                        index + 1,
+                        targetItem.size()),
+                    ex);
+              }
+            }
+            throw new InvalidTypeMetapathException(targetItem,
+                String.format("The key '%s' of type '%s' is not appropriate for an array lookup.",
+                    key.asString(),
+                    key.getClass().getName()));
+
+          }));
+    }
+
+    @Override
+    protected Stream<ICollectionValue> lookupInMap(
+        IMapItem<?> targetItem,
+        DynamicContext dynamicContext,
+        ISequence<?> focus) {
+      ISequence<? extends IAnyAtomicItem> keys
+          = ObjectUtils.requireNonNull(FnData.fnData(getKeyExpression().accept(dynamicContext, focus)));
+
+      return ObjectUtils.notNull(keys.stream()
+          .flatMap(key -> {
+            assert key != null;
+            return Stream.ofNullable(MapGet.get(targetItem, key));
+          }));
+    }
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractMapItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractMapItem.java
new file mode 100644
index 000000000..5177e8704
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractMapItem.java
@@ -0,0 +1,113 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.impl;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.ISequenceType;
+import gov.nist.secauto.metaschema.core.metapath.function.Occurrence;
+import gov.nist.secauto.metaschema.core.metapath.function.library.MapGet;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public abstract class AbstractMapItem<VALUE extends ICollectionValue>
+    extends ImmutableCollections.AbstractImmutableDelegatedMap<IMapKey, VALUE>
+    implements IMapItem<VALUE> {
+  @NonNull
+  public static final QName QNAME = new QName("map");
+  @NonNull
+  public static final Set<FunctionProperty> PROPERTIES = ObjectUtils.notNull(
+      EnumSet.of(FunctionProperty.DETERMINISTIC));
+  @NonNull
+  public static final List<IArgument> ARGUMENTS = ObjectUtils.notNull(List.of(
+      IArgument.builder().name("key").type(IAnyAtomicItem.class).one().build()));
+  @NonNull
+  public static final ISequenceType RESULT = ISequenceType.of(IAnyAtomicItem.class, Occurrence.ZERO_OR_ONE);
+
+  @NonNull
+  private static final IMapItem<?> EMPTY = new MapItemN<>();
+
+  /**
+   * Get an immutable map item that is empty.
+   *
+   * @param <T>
+   *          the item Java type
+   * @return the empty map item
+   */
+
+  @SuppressWarnings("unchecked")
+  @NonNull
+  public static <V extends ICollectionValue> IMapItem<V> empty() {
+    return (IMapItem<V>) EMPTY;
+  }
+
+  @Override
+  public ISequence<?> execute(List<ISequence<?>> arguments, DynamicContext dynamicContext,
+      ISequence<?> focus) {
+    ISequence<? extends IIntegerItem> arg = FunctionUtils.asType(
+        ObjectUtils.notNull(arguments.get(0)));
+
+    IAnyAtomicItem key = arg.getFirstItem(true);
+    if (key == null) {
+      return ISequence.empty(); // NOPMD - readability
+    }
+
+    ICollectionValue result = MapGet.get(this, key);
+    return result == null ? ISequence.empty() : result.asSequence();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(getValue());
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    return other == this
+        || other instanceof IMapItem && getValue().equals(((IMapItem<?>) other).getValue());
+  }
+
+  @Override
+  public String asString() {
+    return ObjectUtils.notNull(toString());
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/SingletonSequenceImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractSequence.java
similarity index 66%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/SingletonSequenceImpl.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractSequence.java
index 2f5244aba..e091098d9 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/SingletonSequenceImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractSequence.java
@@ -24,76 +24,57 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.metapath;
+package gov.nist.secauto.metaschema.core.metapath.impl;
 
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
+import java.util.stream.Collectors;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-class SingletonSequenceImpl<ITEM_TYPE extends IItem> implements ISequence<ITEM_TYPE> {
-  @NonNull
-  private final ITEM_TYPE item;
-
-  public SingletonSequenceImpl(@NonNull ITEM_TYPE item) {
-    this.item = item;
-  }
+public abstract class AbstractSequence<ITEM extends IItem>
+    extends ImmutableCollections.AbstractImmutableDelegatedList<ITEM>
+    implements ISequence<ITEM> {
 
   @NonNull
-  protected ITEM_TYPE getItem() {
-    return item;
+  private static final ISequence<?> EMPTY = new SequenceN<>();
+
+  /**
+   * Get an immutable sequence that is empty.
+   *
+   * @param <T>
+   *          the item Java type
+   * @return the empty sequence
+   */
+  @SuppressWarnings("unchecked")
+  public static <T extends IItem> ISequence<T> empty() {
+    return (ISequence<T>) EMPTY;
   }
 
-  @SuppressWarnings("null")
   @Override
-  public List<ITEM_TYPE> asList() {
-    return List.of(item);
+  public boolean equals(Object other) {
+    // must either be the same instance or a sequence that has the same list
+    // contents
+    return other == this
+        || other instanceof ISequence && getValue().equals(((ISequence<?>) other).getValue());
   }
 
-  @SuppressWarnings("null")
   @Override
-  public Stream<ITEM_TYPE> asStream() {
-    return Stream.of(item);
+  public int hashCode() {
+    return getValue().hashCode();
   }
 
   @Override
-  public boolean isEmpty() {
-    return false;
+  public String asString() {
+    return ObjectUtils.notNull(toString());
   }
 
   @Override
   public String toString() {
-    return asList().toString();
-  }
-
-  @Override
-  public int size() {
-    return 1;
-  }
-
-  @Override
-  public ISequence<ITEM_TYPE> collect() {
-    return this;
-  }
-
-  @Override
-  public void forEach(Consumer<? super ITEM_TYPE> action) {
-    action.accept(item);
-  }
-
-  @Override
-  public boolean equals(Object other) {
-    // must either be the same instance or a sequence that has the same list
-    // contents
-    return other == this
-        || other instanceof ISequence && asList().equals(((ISequence<?>) other).asList());
-  }
-
-  @Override
-  public int hashCode() {
-    return asList().hashCode();
+    return safeStream()
+        .map(Object::toString)
+        .collect(Collectors.joining(",", "(", ")"));
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IInstanceModelChoiceBinding.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractStringMapKey.java
similarity index 78%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IInstanceModelChoiceBinding.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractStringMapKey.java
index 7eeb41687..83bb7b822 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IInstanceModelChoiceBinding.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/AbstractStringMapKey.java
@@ -24,16 +24,22 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema;
+package gov.nist.secauto.metaschema.core.metapath.impl;
 
-import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
 
-public interface IInstanceModelChoiceBinding
-    extends IBindingInstanceModelAbsolute, IChoiceInstance, IBindingContainerModelAbsolute {
+public abstract class AbstractStringMapKey
+    implements IMapKey {
 
   @Override
-  IBindingDefinitionAssembly getOwningDefinition();
+  public int hashCode() {
+    return getKey().asStringItem().hashCode();
+  }
 
   @Override
-  IBindingDefinitionAssembly getContainingDefinition();
+  public boolean equals(Object obj) {
+    return this == obj ||
+        (obj instanceof AbstractStringMapKey
+            && getKey().asStringItem().equals(((AbstractStringMapKey) obj).getKey().asStringItem()));
+  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureBoundContainerFlag.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/ArrayItemN.java
similarity index 64%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureBoundContainerFlag.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/ArrayItemN.java
index e5d2f7976..15142b6a4 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureBoundContainerFlag.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/ArrayItemN.java
@@ -24,40 +24,51 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.impl;
+package gov.nist.secauto.metaschema.core.metapath.impl;
 
-import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerFlag;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-import gov.nist.secauto.metaschema.databind.model.IBoundContainerFlag;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 
-import java.util.Collection;
+import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
 /**
- * Provides default implementations based on a supporting glag container
- * implementation.
+ * An array item that supports an unbounded number of items.
+ *
+ * @param <ITEM>
+ *          the Java type of the items
  */
-public interface IFeatureBoundContainerFlag
-    extends IBoundContainerFlag,
-    IFeatureContainerFlag<IBoundInstanceFlag> {
-
-  @Override
+public class ArrayItemN<ITEM extends ICollectionValue>
+    extends AbstractArrayItem<ITEM> {
   @NonNull
-  IContainerFlagSupport<IBoundInstanceFlag> getFlagContainer();
+  private final List<ITEM> items;
 
-  @Override
-  @Nullable
-  default IBoundInstanceFlag getFlagInstanceByName(String name) {
-    return getFlagContainer().getFlagInstanceMap().get(name);
+  /**
+   * Construct a new array item with the provided items.
+   *
+   * @param items
+   *          the items to add to the array
+   */
+  @SafeVarargs
+  public ArrayItemN(@NonNull ITEM... items) {
+    this(ObjectUtils.notNull(List.of(items)));
+  }
+
+  /**
+   * Construct a new array item using the items from the provided list.
+   *
+   * @param items
+   *          a list containing the items to add to the array
+   */
+  public ArrayItemN(@NonNull List<ITEM> items) {
+    this.items = CollectionUtil.unmodifiableList(items);
   }
 
   @Override
-  @NonNull
-  default Collection<IBoundInstanceFlag> getFlagInstances() {
-    return ObjectUtils.notNull(getFlagContainer().getFlagInstanceMap().values());
+  public List<ITEM> getValue() {
+    return items;
   }
+
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/ImmutableCollections.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/ImmutableCollections.java
new file mode 100644
index 000000000..8d9cc5e52
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/ImmutableCollections.java
@@ -0,0 +1,306 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.impl;
+
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.AbstractCollection;
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * This implementation is inspired by the similar implementation provided by the
+ * JDK.
+ */
+@SuppressWarnings("PMD.MissingStaticMethodInNonInstantiatableClass")
+public final class ImmutableCollections {
+
+  private ImmutableCollections() {
+    // disable construction
+  }
+
+  private static UnsupportedOperationException unsupported() {
+    return new UnsupportedOperationException("method not supported");
+  }
+
+  /**
+   * A base class for an immutable collection.
+   *
+   * @param <T>
+   *          the item Java type
+   */
+  public abstract static class AbstractImmutableCollection<T>
+      extends AbstractCollection<T> {
+
+    @Override
+    public final boolean add(T item) {
+      throw unsupported();
+    }
+
+    @Override
+    public final boolean addAll(Collection<? extends T> collection) {
+      throw unsupported();
+    }
+
+    @Override
+    public final void clear() {
+      throw unsupported();
+    }
+
+    @Override
+    public final boolean remove(Object obj) {
+      throw unsupported();
+    }
+
+    @Override
+    public final boolean removeAll(Collection<?> collection) {
+      throw unsupported();
+    }
+
+    @Override
+    public final boolean removeIf(Predicate<? super T> filter) {
+      throw unsupported();
+    }
+
+    @Override
+    public final boolean retainAll(Collection<?> collection) {
+      throw unsupported();
+    }
+  }
+
+  /**
+   * A base class for an immutable list.
+   *
+   * @param <T>
+   *          the item Java type
+   */
+  public abstract static class AbstractImmutableList<T>
+      extends AbstractImmutableCollection<T>
+      implements List<T> {
+
+    @Override
+    public boolean addAll(int index, Collection<? extends T> collection) {
+      throw unsupported();
+    }
+
+    @Override
+    public T set(int index, T element) {
+      throw unsupported();
+    }
+
+    @Override
+    public void add(int index, T element) {
+      throw unsupported();
+    }
+
+    @Override
+    public T remove(int index) {
+      throw unsupported();
+    }
+  }
+
+  /**
+   * A base class for an immutable list that wraps a list.
+   *
+   * @param <T>
+   *          the item Java type
+   */
+  public abstract static class AbstractImmutableDelegatedList<T>
+      extends AbstractImmutableList<T> {
+
+    /**
+     * Get the wrapped list.
+     *
+     * @return the list
+     */
+    @NonNull
+    protected abstract List<T> getValue();
+
+    @Override
+    public T get(int index) {
+      return getValue().get(index);
+    }
+
+    @Override
+    public int indexOf(Object obj) {
+      return getValue().indexOf(obj);
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+      return getValue().iterator();
+    }
+
+    @Override
+    public int lastIndexOf(Object obj) {
+      return getValue().lastIndexOf(obj);
+    }
+
+    @Override
+    public ListIterator<T> listIterator() {
+      return getValue().listIterator();
+    }
+
+    @Override
+    public ListIterator<T> listIterator(int index) {
+      return getValue().listIterator(index);
+    }
+
+    @Override
+    public int size() {
+      return getValue().size();
+    }
+
+    @Override
+    public List<T> subList(int fromIndex, int toIndex) {
+      return getValue().subList(fromIndex, toIndex);
+    }
+
+    @Override
+    public Stream<T> stream() {
+      return ObjectUtils.notNull(getValue().stream());
+    }
+
+    @Override
+    public String toString() {
+      return getValue().toString();
+    }
+  }
+
+  /**
+   * A base class for an immutable map.
+   *
+   * @param <K>
+   *          the map key Java type
+   * @param <V>
+   *          the map value Java type
+   */
+  public abstract static class AbstractImmutableMap<K, V>
+      extends AbstractMap<K, V> {
+    @Override
+    public void clear() {
+      throw unsupported();
+    }
+
+    @Override
+    public V compute(K key, BiFunction<? super K, ? super V, ? extends V> rf) {
+      throw unsupported();
+    }
+
+    @Override
+    public V computeIfAbsent(K key, Function<? super K, ? extends V> mf) {
+      throw unsupported();
+    }
+
+    @Override
+    public V computeIfPresent(K key, BiFunction<? super K, ? super V, ? extends V> rf) {
+      throw unsupported();
+    }
+
+    @Override
+    public V merge(K key, V value, BiFunction<? super V, ? super V, ? extends V> rf) {
+      throw unsupported();
+    }
+
+    @Override
+    public V put(K key, V value) {
+      throw unsupported();
+    }
+
+    @Override
+    public void putAll(Map<? extends K, ? extends V> map) {
+      throw unsupported();
+    }
+
+    @Override
+    public V putIfAbsent(K key, V value) {
+      throw unsupported();
+    }
+
+    @Override
+    public V remove(Object key) {
+      throw unsupported();
+    }
+
+    @Override
+    public boolean remove(Object key, Object value) {
+      throw unsupported();
+    }
+
+    @Override
+    public V replace(K key, V value) {
+      throw unsupported();
+    }
+
+    @Override
+    public boolean replace(K key, V oldValue, V newValue) {
+      throw unsupported();
+    }
+
+    @Override
+    public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {
+      throw unsupported();
+    }
+  }
+
+  /**
+   * A base class for an immutable map that wraps a map.
+   *
+   * @param <K>
+   *          the map key Java type
+   * @param <V>
+   *          the map value Java type
+   */
+  public abstract static class AbstractImmutableDelegatedMap<K, V>
+      extends AbstractImmutableMap<K, V> {
+
+    /**
+     * Get the wrapped map.
+     *
+     * @return the map
+     */
+    @NonNull
+    protected abstract Map<K, V> getValue();
+
+    @Override
+    public Set<Entry<K, V>> entrySet() {
+      return Collections.unmodifiableSet(getValue().entrySet());
+    }
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/InsertVisitor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/MapItemN.java
similarity index 60%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/InsertVisitor.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/MapItemN.java
index 6e725d6d5..19879d5a7 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/InsertVisitor.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/MapItemN.java
@@ -24,52 +24,51 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.datatype.markup.flexmark;
+package gov.nist.secauto.metaschema.core.metapath.impl;
 
-import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.ast.NodeVisitorBase;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
-import gov.nist.secauto.metaschema.core.datatype.markup.IMarkupString;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.function.Predicate;
+import java.util.Map;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public class InsertVisitor
-    extends NodeVisitorBase {
-  @NonNull
-  private final List<InsertAnchorNode> inserts
-      = new LinkedList<>();
+/**
+ * An map item that supports an unbounded number of entries.
+ *
+ * @param <VALUE>
+ *          the Java type of the entry values
+ */
+public class MapItemN<VALUE extends ICollectionValue>
+    extends AbstractMapItem<VALUE> {
   @NonNull
-  private final Predicate<InsertAnchorNode> filter;
+  private final Map<IMapKey, VALUE> entries;
 
-  public InsertVisitor(
-      @NonNull Predicate<InsertAnchorNode> filter) {
-    this.filter = filter;
+  /**
+   * Construct a new map item with the provided entries.
+   *
+   * @param entries
+   *          the entries to add to the map
+   */
+  @SafeVarargs
+  public MapItemN(@NonNull Map.Entry<IMapKey, ? extends VALUE>... entries) {
+    this(ObjectUtils.notNull(Map.ofEntries(entries)));
   }
 
-  public InsertVisitor processNode(@NonNull IMarkupString<?> markup) {
-    visit(markup.getDocument());
-    return this;
+  /**
+   * Construct a new map item using the entries from the provided map.
+   *
+   * @param entries
+   *          a map containing the entries to add to the map
+   */
+  public MapItemN(@NonNull Map<IMapKey, VALUE> entries) {
+    this.entries = CollectionUtil.unmodifiableMap(entries);
   }
 
   @Override
-  protected void visit(Node node) {
-    if (node instanceof InsertAnchorNode) {
-      InsertAnchorNode insert = (InsertAnchorNode) node;
-      if (filter.test(insert)) {
-        inserts.add((InsertAnchorNode) node);
-      }
-    } else {
-      visitChildren(node);
-    }
-  }
-
-  @NonNull
-  public List<InsertAnchorNode> getInserts() {
-    return inserts;
+  public Map<IMapKey, VALUE> getValue() {
+    return entries;
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ListSequenceImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SequenceN.java
similarity index 61%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ListSequenceImpl.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SequenceN.java
index 3bf294a4e..cf557cfcb 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/ListSequenceImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SequenceN.java
@@ -24,7 +24,7 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.metapath;
+package gov.nist.secauto.metaschema.core.metapath.impl;
 
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
@@ -33,68 +33,66 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-class ListSequenceImpl<ITEM_TYPE extends IItem> implements ISequence<ITEM_TYPE> {
+/**
+ * A Metapath sequence supporting an unbounded number of items.
+ *
+ * @param <ITEM>
+ *          the Java type of the items
+ */
+public class SequenceN<ITEM extends IItem>
+    extends AbstractSequence<ITEM> {
   @NonNull
-  private final List<ITEM_TYPE> items;
-
-  public ListSequenceImpl(@NonNull Collection<ITEM_TYPE> items) {
-    this(new ArrayList<>(items), false);
-  }
-
-  public ListSequenceImpl(@NonNull List<ITEM_TYPE> items, boolean copy) {
+  private final List<ITEM> items;
+
+  /**
+   * Construct a new sequence with the provided items.
+   *
+   * @param items
+   *          a collection containing the items to add to the sequence
+   * @param copy
+   *          if {@code true} make a defensive copy of the list or {@code false}
+   *          otherwise
+   */
+  public SequenceN(@NonNull List<ITEM> items, boolean copy) {
     this.items = CollectionUtil.unmodifiableList(copy ? new ArrayList<>(items) : items);
   }
 
-  @Override
-  public List<ITEM_TYPE> asList() {
-    return items;
-  }
-
-  @Override
-  public Stream<ITEM_TYPE> asStream() {
-    return ObjectUtils.notNull(items.stream());
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return items.isEmpty();
+  /**
+   * Construct a new sequence with the provided items.
+   *
+   * @param items
+   *          the items to add to the sequence
+   */
+  @SafeVarargs
+  public SequenceN(@NonNull ITEM... items) {
+    this(ObjectUtils.notNull(List.of(items)), false);
   }
 
-  @Override
-  public String toString() {
-    return asList().toString();
-  }
-
-  @Override
-  public int size() {
-    return items.size();
-  }
-
-  @Override
-  public ISequence<ITEM_TYPE> collect() {
-    return this;
-  }
-
-  @Override
-  public void forEach(Consumer<? super ITEM_TYPE> action) {
-    items.forEach(action);
+  /**
+   * Construct a new sequence with the provided items.
+   *
+   * @param items
+   *          a collection containing the items to add to the sequence
+   */
+  public SequenceN(@NonNull Collection<ITEM> items) {
+    this(new ArrayList<>(items), false);
   }
 
-  @Override
-  public boolean equals(Object other) {
-    // must either be the same instance or a sequence that has the same list
-    // contents
-    return other == this
-        || other instanceof ISequence && asList().equals(((ISequence<?>) other).asList());
+  /**
+   * Construct a new sequence with the provided items.
+   *
+   * @param items
+   *          a list containing the items to add to the sequence
+   */
+  public SequenceN(@NonNull List<ITEM> items) {
+    this(items, false);
   }
 
   @Override
-  public int hashCode() {
-    return asList().hashCode();
+  public List<ITEM> getValue() {
+    return items;
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/EmptyListImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SingletonSequence.java
similarity index 70%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/EmptyListImpl.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SingletonSequence.java
index 56e2bfbe4..8d0e046f4 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/EmptyListImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/SingletonSequence.java
@@ -24,58 +24,61 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.metapath;
+package gov.nist.secauto.metaschema.core.metapath.impl;
 
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-class EmptyListImpl<ITEM_TYPE extends IItem> implements ISequence<ITEM_TYPE> {
+import edu.umd.cs.findbugs.annotations.NonNull;
 
-  @SuppressWarnings("null")
-  @Override
-  public List<ITEM_TYPE> asList() {
-    return Collections.emptyList();
+/**
+ * A Metapath sequence supporting a singleton item.
+ *
+ * @param <ITEM>
+ *          the Java type of the items
+ */
+public class SingletonSequence<ITEM extends IItem>
+    extends AbstractSequence<ITEM> {
+  @NonNull
+  private final ITEM item;
+
+  /**
+   * Construct a new sequence with the provided item.
+   *
+   * @param item
+   *          the item to add to the sequence
+   */
+  public SingletonSequence(@NonNull ITEM item) {
+    this.item = item;
   }
 
-  @SuppressWarnings("null")
   @Override
-  public Stream<ITEM_TYPE> asStream() {
-    return Stream.empty();
+  public List<ITEM> getValue() {
+    return CollectionUtil.singletonList(item);
   }
 
   @Override
   public boolean isEmpty() {
-    return true;
+    return false;
   }
 
   @Override
   public int size() {
-    return 0;
-  }
-
-  @Override
-  public ISequence<ITEM_TYPE> collect() {
-    return this;
-  }
-
-  @Override
-  public void forEach(Consumer<? super ITEM_TYPE> action) {
-    // do nothing
+    return 1;
   }
 
+  @SuppressWarnings("null")
   @Override
-  public boolean equals(Object other) {
-    // must either be the same instance or a sequence that is empty
-    return other == this
-        || other instanceof ISequence && ((ISequence<?>) other).isEmpty();
+  public Stream<ITEM> stream() {
+    return Stream.of(item);
   }
 
   @Override
-  public int hashCode() {
-    return 1;
+  public void forEach(Consumer<? super ITEM> action) {
+    action.accept(item);
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StreamSequenceImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/StreamSequence.java
similarity index 68%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StreamSequenceImpl.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/StreamSequence.java
index 184cf4acb..3612b4a90 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/StreamSequenceImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/impl/StreamSequence.java
@@ -24,7 +24,7 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.metapath;
+package gov.nist.secauto.metaschema.core.metapath.impl;
 
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -37,25 +37,35 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-class StreamSequenceImpl<ITEM_TYPE extends IItem> implements ISequence<ITEM_TYPE> {
-  private Stream<ITEM_TYPE> stream;
-  private List<ITEM_TYPE> list;
+/**
+ * A Metapath sequence supporting an unbounded number of items backed initially
+ * by a stream.
+ *
+ * @param <ITEM>
+ *          the Java type of the items
+ */
+public class StreamSequence<ITEM extends IItem>
+    extends AbstractSequence<ITEM> {
+
+  private Stream<ITEM> stream;
+  private List<ITEM> list;
 
-  public StreamSequenceImpl(@NonNull Stream<ITEM_TYPE> stream) {
+  /**
+   * Construct a new sequence using the provided item stream.
+   *
+   * @param stream
+   *          the items to add to the sequence
+   */
+  public StreamSequence(@NonNull Stream<ITEM> stream) {
     Objects.requireNonNull(stream, "stream");
     this.stream = stream;
   }
 
   @Override
-  public boolean isEmpty() {
-    return asList().isEmpty();
-  }
-
-  @Override
-  public List<ITEM_TYPE> asList() {
+  public List<ITEM> getValue() {
     synchronized (this) {
       if (list == null) {
-        list = asStream().collect(Collectors.toUnmodifiableList());
+        list = stream().collect(Collectors.toUnmodifiableList());
       }
       assert list != null;
       return list;
@@ -63,8 +73,9 @@ public List<ITEM_TYPE> asList() {
   }
 
   @Override
-  public Stream<ITEM_TYPE> asStream() {
-    @NonNull Stream<ITEM_TYPE> retval;
+  public Stream<ITEM> stream() {
+    @NonNull Stream<ITEM> retval;
+    // Ensure thread safety and prevent multiple consumptions of the stream
     synchronized (this) {
       if (list == null) {
         if (stream == null) {
@@ -81,36 +92,7 @@ public Stream<ITEM_TYPE> asStream() {
   }
 
   @Override
-  public void forEach(Consumer<? super ITEM_TYPE> action) {
-    asStream().forEachOrdered(action);
-  }
-
-  @Override
-  public String toString() {
-    return asList().toString();
-  }
-
-  @Override
-  public int size() {
-    return asList().size();
-  }
-
-  @Override
-  public ISequence<ITEM_TYPE> collect() {
-    asList();
-    return this;
-  }
-
-  @Override
-  public boolean equals(Object other) {
-    // must either be the same instance or a sequence that has the same list
-    // contents
-    return other == this
-        || other instanceof ISequence && asList().equals(((ISequence<?>) other).asList());
-  }
-
-  @Override
-  public int hashCode() {
-    return asList().hashCode();
+  public void forEach(Consumer<? super ITEM> action) {
+    stream().forEachOrdered(action);
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItem.java
index b1ea60637..92c4f4df8 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/IItem.java
@@ -27,8 +27,13 @@
 package gov.nist.secauto.metaschema.core.metapath.item;
 
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+
+import java.util.stream.Stream;
+
+public interface IItem extends ICollectionValue {
 
-public interface IItem {
   /**
    * Get the item's "wrapped" value. This "wrapped" value may be:
    * <ul>
@@ -54,4 +59,15 @@ public interface IItem {
   default boolean hasValue() {
     return getValue() != null;
   }
+
+  @Override
+  default ISequence<?> asSequence() {
+    return ISequence.of(this);
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  default Stream<? extends IItem> flatten() {
+    return Stream.of(this);
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/TypeSystem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/TypeSystem.java
new file mode 100644
index 000000000..89a739963
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/TypeSystem.java
@@ -0,0 +1,164 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.item;
+
+import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
+import gov.nist.secauto.metaschema.core.metapath.StaticContext;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDecimalItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDurationItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IEmailAddressItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IHostnameItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPv4AddressItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIPv6AddressItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.INcNameItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.INonNegativeIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IPositiveIntegerItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.ITokenItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUriReferenceItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUuidItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IFieldNodeItem;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem;
+import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+@SuppressWarnings("removal")
+public final class TypeSystem {
+  private static final Map<Class<? extends IItem>, QName> ITEM_CLASS_TO_QNAME_MAP;
+
+  static {
+    ITEM_CLASS_TO_QNAME_MAP = Collections.unmodifiableMap(Map.ofEntries(
+        register(IItem.class, "item"),
+        register(INodeItem.class, "node"),
+        register(IDocumentNodeItem.class, "document-node"),
+        register(IAssemblyNodeItem.class, "assembly-node"),
+        register(IFieldNodeItem.class, "field-node"),
+        register(IFlagNodeItem.class, "flag-node"),
+        register(IArrayItem.class, "array"),
+        register(IMapItem.class, "map"),
+        register(IAnyAtomicItem.class, "any-atomic-type"),
+        register(INumericItem.class, "numeric"),
+        register(IDurationItem.class, "duration"),
+        register(IBase64BinaryItem.class, MetaschemaDataTypeProvider.BASE64),
+        register(IBooleanItem.class, MetaschemaDataTypeProvider.BOOLEAN),
+        register(IDateItem.class, MetaschemaDataTypeProvider.DATE),
+        // register(IDate.class, MetaschemaDataTypeProvider.DATE_WITH_TZ),
+        register(IDateTimeItem.class, MetaschemaDataTypeProvider.DATE_TIME),
+        // register(IBooleanItem.class, MetaschemaDataTypeProvider.DATE_TIME_WITH_TZ),
+        register(IIPv4AddressItem.class, MetaschemaDataTypeProvider.IP_V4_ADDRESS),
+        register(IIPv6AddressItem.class, MetaschemaDataTypeProvider.IP_V6_ADDRESS),
+        register(IAnyUriItem.class, MetaschemaDataTypeProvider.URI),
+        register(IUriReferenceItem.class, MetaschemaDataTypeProvider.URI_REFERENCE),
+        register(IUuidItem.class, MetaschemaDataTypeProvider.UUID),
+        register(IDayTimeDurationItem.class, MetaschemaDataTypeProvider.DAY_TIME_DURATION),
+        register(IYearMonthDurationItem.class, MetaschemaDataTypeProvider.YEAR_MONTH_DURATION),
+        register(IDecimalItem.class, MetaschemaDataTypeProvider.DECIMAL),
+        register(IIntegerItem.class, MetaschemaDataTypeProvider.INTEGER),
+        register(INonNegativeIntegerItem.class, MetaschemaDataTypeProvider.NON_NEGATIVE_INTEGER),
+        register(IPositiveIntegerItem.class, MetaschemaDataTypeProvider.POSITIVE_INTEGER),
+        register(IEmailAddressItem.class, MetaschemaDataTypeProvider.EMAIL_ADDRESS),
+        register(IHostnameItem.class, MetaschemaDataTypeProvider.HOSTNAME),
+        register(INcNameItem.class, MetaschemaDataTypeProvider.NCNAME),
+        register(IStringItem.class, MetaschemaDataTypeProvider.STRING),
+        register(ITokenItem.class, MetaschemaDataTypeProvider.TOKEN)));
+  }
+
+  private static Map.Entry<Class<? extends IItem>, QName> register(
+      @NonNull Class<? extends IItem> clazz,
+      @NonNull IDataTypeAdapter<?> adapter) {
+    return Map.entry(clazz, adapter.getPreferredName());
+  }
+
+  private static Map.Entry<Class<? extends IItem>, QName> register(
+      @NonNull Class<? extends IItem> clazz,
+      @NonNull String typeName) {
+    return Map.entry(clazz, new QName(MetapathConstants.NS_METAPATH.toASCIIString(), typeName));
+  }
+
+  @NonNull
+  private static Stream<Class<? extends IItem>> getItemInterfaces(@NonNull Class<?> clazz) {
+    @SuppressWarnings("unchecked") Stream<Class<? extends IItem>> retval = IItem.class.isAssignableFrom(clazz)
+        ? Stream.of((Class<? extends IItem>) clazz)
+        : Stream.empty();
+
+    Class<?>[] interfaces = clazz.getInterfaces();
+    if (interfaces.length > 0) {
+      retval = Stream.concat(retval, Arrays.stream(interfaces).flatMap(TypeSystem::getItemInterfaces));
+    }
+
+    return ObjectUtils.notNull(retval);
+  }
+
+  /**
+   * Get the human-friendly data type name for the provided Metapath item class.
+   *
+   * @param clazz
+   *          the Metapath item class to get the name for
+   * @return the name or {@code null} if no name is registered for the item class
+   */
+  public static String getName(@NonNull Class<? extends IItem> clazz) {
+    Class<? extends IItem> itemClass = getItemInterfaces(clazz).findFirst().orElse(null);
+
+    QName qname = ITEM_CLASS_TO_QNAME_MAP.get(itemClass);
+    return qname == null ? clazz.getName() : asPrefixedName(qname);
+  }
+
+  private static String asPrefixedName(@NonNull QName qname) {
+    String namespace = qname.getNamespaceURI();
+    String prefix = namespace.isEmpty() ? null : StaticContext.getWellKnownPrefixForUri(namespace);
+    return prefix == null ? qname.toString() : prefix + ":" + qname.getLocalPart();
+  }
+
+  private TypeSystem() {
+    // disable construction
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractDateItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractDateItem.java
index 8f4649a2e..17e71cab0 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractDateItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractDateItem.java
@@ -29,7 +29,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public abstract class AbstractDateItem<TYPE>
-    extends AbstractAnyAtomicItem<TYPE>
+    extends AbstractTemporalItem<TYPE>
     implements IDateItem {
   /**
    * Construct a new item with the provided {@code value}.
@@ -41,6 +41,11 @@ protected AbstractDateItem(@NonNull TYPE value) {
     super(value);
   }
 
+  @Override
+  public boolean hasTimezone() {
+    return true;
+  }
+
   @Override
   public int hashCode() {
     return asZonedDateTime().hashCode();
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractDateTimeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractDateTimeItem.java
index 9de39e709..9778e8dcc 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractDateTimeItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractDateTimeItem.java
@@ -29,7 +29,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public abstract class AbstractDateTimeItem<TYPE>
-    extends AbstractAnyAtomicItem<TYPE>
+    extends AbstractTemporalItem<TYPE>
     implements IDateTimeItem {
   /**
    * Construct a new item with the provided {@code value}.
@@ -41,6 +41,11 @@ protected AbstractDateTimeItem(@NonNull TYPE value) {
     super(value);
   }
 
+  @Override
+  public boolean hasTimezone() {
+    return true;
+  }
+
   @Override
   public int hashCode() {
     return asZonedDateTime().hashCode();
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractDecimalItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractDecimalItem.java
new file mode 100644
index 000000000..8b5f2933e
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractDecimalItem.java
@@ -0,0 +1,72 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.item.atomic;
+
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public abstract class AbstractDecimalItem<TYPE>
+    extends AbstractAnyAtomicItem<TYPE>
+    implements IDecimalItem {
+
+  /**
+   * Construct a new item with the provided {@code value}.
+   *
+   * @param value
+   *          the value to wrap
+   */
+  protected AbstractDecimalItem(@NonNull TYPE value) {
+    super(value);
+  }
+
+  @Override
+  public IMapKey asMapKey() {
+    return new MapKey();
+  }
+
+  private final class MapKey
+      implements IMapKey {
+
+    @Override
+    public IDecimalItem getKey() {
+      return AbstractDecimalItem.this;
+    }
+
+    @Override
+    public int hashCode() {
+      return getKey().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return this == obj ||
+          (obj instanceof AbstractDecimalItem.MapKey
+              && getKey().asDecimal().equals(((AbstractDecimalItem<?>.MapKey) obj).getKey().asDecimal()));
+    }
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractIntegerItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractIntegerItem.java
index 56a181b26..427943c1c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractIntegerItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractIntegerItem.java
@@ -33,7 +33,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public abstract class AbstractIntegerItem
-    extends AbstractAnyAtomicItem<BigInteger>
+    extends AbstractDecimalItem<BigInteger>
     implements IIntegerItem {
   /**
    * Construct a new item with the provided {@code value}.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractStringItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractStringItem.java
index 5c927cc32..3da0f8d2d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractStringItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractStringItem.java
@@ -26,6 +26,9 @@
 
 package gov.nist.secauto.metaschema.core.metapath.item.atomic;
 
+import gov.nist.secauto.metaschema.core.metapath.impl.AbstractStringMapKey;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public abstract class AbstractStringItem
@@ -47,6 +50,11 @@ public String asString() {
     return getValue();
   }
 
+  @Override
+  public IMapKey asMapKey() {
+    return new MapKey();
+  }
+
   @Override
   public int hashCode() {
     return asString().hashCode();
@@ -58,4 +66,13 @@ public boolean equals(Object obj) {
     return this == obj
         || (obj instanceof IStringItem && compareTo((IStringItem) obj) == 0);
   }
+
+  private final class MapKey
+      extends AbstractStringMapKey {
+
+    @Override
+    public IStringItem getKey() {
+      return AbstractStringItem.this;
+    }
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractTemporalItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractTemporalItem.java
new file mode 100644
index 000000000..4b55c60cd
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractTemporalItem.java
@@ -0,0 +1,86 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.item.atomic;
+
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A base class for temporal items.
+ *
+ * @param <TYPE>
+ *          the Java type of the wrapped value
+ */
+public abstract class AbstractTemporalItem<TYPE>
+    extends AbstractAnyAtomicItem<TYPE>
+    implements ITemporalItem {
+
+  /**
+   * Construct a new temporal item.
+   *
+   * @param value
+   *          the wrapped value
+   */
+  protected AbstractTemporalItem(@NonNull TYPE value) {
+    super(value);
+  }
+
+  @Override
+  public IMapKey asMapKey() {
+    return new MapKey();
+  }
+
+  private final class MapKey
+      implements IMapKey {
+
+    @Override
+    public ITemporalItem getKey() {
+      return AbstractTemporalItem.this;
+    }
+
+    @Override
+    public int hashCode() {
+      return getKey().hashCode();
+    }
+
+    @SuppressWarnings("PMD.OnlyOneReturn")
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj) {
+        return true;
+      }
+
+      if (!(obj instanceof AbstractTemporalItem.MapKey)) {
+        return false;
+      }
+
+      AbstractTemporalItem<?>.MapKey other = (AbstractTemporalItem<?>.MapKey) obj;
+      return getKey().compareTo(other.getKey()) == 0;
+    }
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java
new file mode 100644
index 000000000..3567c69b6
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java
@@ -0,0 +1,67 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.item.atomic;
+
+import gov.nist.secauto.metaschema.core.metapath.impl.AbstractStringMapKey;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A base class for untyped atomic items.
+ *
+ * @param <TYPE>
+ *          the Java type of the wrapped value
+ */
+public abstract class AbstractUntypedAtomicItem<TYPE>
+    extends AbstractAnyAtomicItem<TYPE>
+    implements IUntypedAtomicItem {
+
+  /**
+   * Construct a new untyped atomic valued item.
+   *
+   * @param value
+   *          the value
+   */
+  protected AbstractUntypedAtomicItem(@NonNull TYPE value) {
+    super(value);
+  }
+
+  @Override
+  public IMapKey asMapKey() {
+    return new MapKey();
+  }
+
+  private final class MapKey
+      extends AbstractStringMapKey {
+
+    @Override
+    public IUntypedAtomicItem getKey() {
+      return AbstractUntypedAtomicItem.this;
+    }
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractUriItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractUriItem.java
index f83932e31..98a979f81 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractUriItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/AbstractUriItem.java
@@ -26,6 +26,9 @@
 
 package gov.nist.secauto.metaschema.core.metapath.item.atomic;
 
+import gov.nist.secauto.metaschema.core.metapath.impl.AbstractStringMapKey;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
+
 import java.net.URI;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -50,6 +53,11 @@ public URI asUri() {
     return getValue();
   }
 
+  @Override
+  public IMapKey asMapKey() {
+    return new MapKey();
+  }
+
   @Override
   public int hashCode() {
     return asUri().hashCode();
@@ -61,4 +69,13 @@ public boolean equals(Object obj) {
     return this == obj
         || (obj instanceof IAnyUriItem && compareTo((IAnyUriItem) obj) == 0);
   }
+
+  private final class MapKey
+      extends AbstractStringMapKey {
+
+    @Override
+    public IAnyUriItem getKey() {
+      return AbstractUriItem.this;
+    }
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/Base64BinaryItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/Base64BinaryItemImpl.java
index fd6928109..bac8f6af9 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/Base64BinaryItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/Base64BinaryItemImpl.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.Base64Adapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
 
 import java.nio.ByteBuffer;
 
@@ -51,6 +52,11 @@ public ByteBuffer asByteBuffer() {
     return getValue();
   }
 
+  @Override
+  public IMapKey asMapKey() {
+    return new MapKey();
+  }
+
   @Override
   public int hashCode() {
     return asByteBuffer().hashCode();
@@ -62,4 +68,23 @@ public boolean equals(Object obj) {
     return this == obj
         || (obj instanceof IBase64BinaryItem && compareTo((IBase64BinaryItem) obj) == 0);
   }
+
+  private final class MapKey implements IMapKey {
+    @Override
+    public IBase64BinaryItem getKey() {
+      return Base64BinaryItemImpl.this;
+    }
+
+    @Override
+    public int hashCode() {
+      return getKey().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return this == obj ||
+          (obj instanceof MapKey
+              && getKey().equals(((MapKey) obj).getKey()));
+    }
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/BooleanItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/BooleanItemImpl.java
index 9a8daf727..981f0d630 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/BooleanItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/BooleanItemImpl.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -77,6 +78,11 @@ public String toString() {
     return asString();
   }
 
+  @Override
+  public IMapKey asMapKey() {
+    return new MapKey();
+  }
+
   @Override
   public int hashCode() {
     return Boolean.hashCode(booleanValue);
@@ -88,4 +94,23 @@ public boolean equals(Object obj) {
     return this == obj
         || (obj instanceof IBooleanItem && compareTo((IBooleanItem) obj) == 0);
   }
+
+  private final class MapKey implements IMapKey {
+    @Override
+    public IBooleanItem getKey() {
+      return BooleanItemImpl.this;
+    }
+
+    @Override
+    public int hashCode() {
+      return getKey().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return this == obj ||
+          (obj instanceof MapKey
+              && getKey().equals(((MapKey) obj).getKey()));
+    }
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/DayTimeDurationItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/DayTimeDurationItemImpl.java
index 67768d16d..0069771f0 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/DayTimeDurationItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/DayTimeDurationItemImpl.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.DayTimeAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
 
 import java.time.Duration;
 
@@ -51,6 +52,11 @@ public DayTimeAdapter getJavaTypeAdapter() {
     return MetaschemaDataTypeProvider.DAY_TIME_DURATION;
   }
 
+  @Override
+  public IMapKey asMapKey() {
+    return new MapKey();
+  }
+
   @Override
   public int hashCode() {
     return asDuration().hashCode();
@@ -62,4 +68,23 @@ public boolean equals(Object obj) {
     return this == obj
         || (obj instanceof IDayTimeDurationItem && compareTo((IDayTimeDurationItem) obj) == 0);
   }
+
+  private final class MapKey implements IMapKey {
+    @Override
+    public IDayTimeDurationItem getKey() {
+      return DayTimeDurationItemImpl.this;
+    }
+
+    @Override
+    public int hashCode() {
+      return getKey().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return this == obj ||
+          (obj instanceof MapKey
+              && getKey().equals(((MapKey) obj).getKey()));
+    }
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/DecimalItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/DecimalItemImpl.java
index 7e375c959..af4f04646 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/DecimalItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/DecimalItemImpl.java
@@ -36,8 +36,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 class DecimalItemImpl
-    extends AbstractAnyAtomicItem<BigDecimal>
-    implements IDecimalItem {
+    extends AbstractDecimalItem<BigDecimal> {
   public DecimalItemImpl(@NonNull BigDecimal value) {
     super(value);
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java
index 29e033264..69ef9e9dc 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java
@@ -27,13 +27,16 @@
 package gov.nist.secauto.metaschema.core.metapath.item.atomic;
 
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.IPrintable;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.Set;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public interface IAnyAtomicItem extends IAtomicValuedItem {
+public interface IAnyAtomicItem extends IAtomicValuedItem, IPrintable {
   @NonNull
   Set<Class<? extends IAnyAtomicItem>> PRIMITIVE_ITEM_TYPES = ObjectUtils.notNull(Set.of(
       IStringItem.class,
@@ -69,9 +72,18 @@ default IAnyAtomicItem toAtomicItem() {
    *
    * @return the string value value of the item
    */
+  @Override
   @NonNull
   String asString();
 
+  /**
+   * Get the atomic item value as a map key for use with an {@link IMapItem}.
+   *
+   * @return the map key
+   */
+  @NonNull
+  IMapKey asMapKey();
+
   /**
    * Get a new {@link IStringItem} based on the the textual value of the item's
    * "wrapped" value.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyUriItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyUriItem.java
index 783af6d35..708d4b7b8 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyUriItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IAnyUriItem.java
@@ -120,7 +120,7 @@ default boolean isOpaque() {
    */
   @NonNull
   default IAnyUriItem resolve(@NonNull IAnyUriItem other) {
-    return IAnyUriItem.valueOf(ObjectUtils.notNull(asUri().resolve(other.asUri())));
+    return valueOf(ObjectUtils.notNull(asUri().resolve(other.asUri())));
   }
 
   @Override
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateItem.java
index bf0252537..1d0eaac81 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateItem.java
@@ -36,7 +36,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public interface IDateItem extends IAnyAtomicItem {
+public interface IDateItem extends ITemporalItem {
 
   /**
    * Construct a new date item using the provided string {@code value}.
@@ -100,28 +100,8 @@ default IDateItem castAsType(IAnyAtomicItem item) {
     return cast(item);
   }
 
-  /**
-   * Get the "wrapped" date value.
-   *
-   * @return the underlying date value
-   */
-  @NonNull
-  ZonedDateTime asZonedDateTime();
-
   @Override
   default int compareTo(IAnyAtomicItem item) {
     return compareTo(cast(item));
   }
-
-  /**
-   * Compares this value with the argument.
-   *
-   * @param item
-   *          the item to compare with this value
-   * @return a negative integer, zero, or a positive integer if this value is less
-   *         than, equal to, or greater than the {@code item}.
-   */
-  default int compareTo(@NonNull IDateItem item) {
-    return asZonedDateTime().compareTo(item.asZonedDateTime());
-  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateTimeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateTimeItem.java
index 76e1f56cd..e0523362c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateTimeItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDateTimeItem.java
@@ -34,7 +34,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public interface IDateTimeItem extends IAnyAtomicItem {
+public interface IDateTimeItem extends ITemporalItem {
   /**
    * Construct a new date/time item using the provided string {@code value}.
    *
@@ -96,28 +96,8 @@ default IDateTimeItem castAsType(IAnyAtomicItem item) {
     return cast(item);
   }
 
-  /**
-   * Get the "wrapped" date/time value.
-   *
-   * @return the underlying date value
-   */
-  @NonNull
-  ZonedDateTime asZonedDateTime();
-
   @Override
   default int compareTo(IAnyAtomicItem item) {
     return compareTo(cast(item));
   }
-
-  /**
-   * Compares this value with the argument.
-   *
-   * @param item
-   *          the item to compare with this value
-   * @return a negative integer, zero, or a positive integer if this value is less
-   *         than, equal to, or greater than the {@code item}.
-   */
-  default int compareTo(@NonNull IDateTimeItem item) {
-    return asZonedDateTime().compareTo(item.asZonedDateTime());
-  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDecimalItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDecimalItem.java
index 408193a2f..d6d23bf64 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDecimalItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IDecimalItem.java
@@ -34,6 +34,7 @@
 import java.math.RoundingMode;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 public interface IDecimalItem extends INumericItem {
   @SuppressWarnings("null")
@@ -104,7 +105,7 @@ static IDecimalItem valueOf(@NonNull BigDecimal value) {
    *           if the provided {@code item} cannot be cast to this type
    */
   @NonNull
-  static IDecimalItem cast(@NonNull IAnyAtomicItem item) {
+  static IDecimalItem cast(@Nullable IAnyAtomicItem item) {
     return MetaschemaDataTypeProvider.DECIMAL.cast(item);
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPAddressItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPAddressItem.java
index a84d82c78..e8907a9be 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPAddressItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIPAddressItem.java
@@ -38,9 +38,6 @@ public interface IIPAddressItem extends IUntypedAtomicItem {
   @NonNull
   IPAddress asIpAddress();
 
-  @Override
-  int compareTo(IAnyAtomicItem item);
-
   /**
    * Compares this value with the argument.
    *
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIntegerItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIntegerItem.java
index 36216c291..ad72386c7 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIntegerItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IIntegerItem.java
@@ -67,6 +67,20 @@ static IIntegerItem valueOf(@NonNull String value) {
     }
   }
 
+  /**
+   * Construct a new integer item using the provided {@code value}.
+   *
+   * @param value
+   *          a long value
+   * @return the new item
+   */
+  @NonNull
+  static IIntegerItem valueOf(int value) {
+    @SuppressWarnings("null")
+    @NonNull BigInteger bigInteger = BigInteger.valueOf(value);
+    return valueOf(bigInteger);
+  }
+
   /**
    * Construct a new integer item using the provided {@code value}.
    *
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IPv4AddressItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IPv4AddressItemImpl.java
index b86d4108a..f4660650e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IPv4AddressItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IPv4AddressItemImpl.java
@@ -33,7 +33,7 @@
 import inet.ipaddr.ipv4.IPv4Address;
 
 class IPv4AddressItemImpl
-    extends AbstractAnyAtomicItem<IPv4Address>
+    extends AbstractUntypedAtomicItem<IPv4Address>
     implements IIPv4AddressItem {
 
   public IPv4AddressItemImpl(@NonNull IPv4Address value) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IPv6AddressItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IPv6AddressItemImpl.java
index 838bd8f37..69b0c398d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IPv6AddressItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/IPv6AddressItemImpl.java
@@ -33,7 +33,7 @@
 import inet.ipaddr.ipv6.IPv6Address;
 
 class IPv6AddressItemImpl
-    extends AbstractAnyAtomicItem<IPv6Address>
+    extends AbstractUntypedAtomicItem<IPv6Address>
     implements IIPv6AddressItem {
 
   public IPv6AddressItemImpl(@NonNull IPv6Address value) {
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITemporalItem.java
similarity index 67%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractDefinition.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITemporalItem.java
index 1af2b5dda..f59f051b0 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/ITemporalItem.java
@@ -24,29 +24,38 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
+package gov.nist.secauto.metaschema.core.metapath.item.atomic;
 
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinition;
+import java.time.ZonedDateTime;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public abstract class AbstractDefinition<BINDING>
-    extends AbstractBinding<BINDING>
-    implements IBindingDefinition {
-  @NonNull
-  private final IBindingModule module;
-
-  protected AbstractDefinition(
-      @NonNull BINDING binding,
-      @NonNull IBindingModule module) {
-    super(binding);
-    this.module = module;
+public interface ITemporalItem extends IAnyAtomicItem {
+  /**
+   * Determine if the temporal item has a timezone.
+   *
+   * @return {@code true} if the temporal item has a timezone or {@code false}
+   *         otherwise
+   */
+  boolean hasTimezone();
 
-  }
+  /**
+   * Get the "wrapped" date/time value.
+   *
+   * @return the underlying date value
+   */
+  @NonNull
+  ZonedDateTime asZonedDateTime();
 
-  @Override
-  public IBindingModule getContainingModule() {
-    return module;
+  /**
+   * Compares this value with the argument.
+   *
+   * @param item
+   *          the item to compare with this value
+   * @return a negative integer, zero, or a positive integer if this value is less
+   *         than, equal to, or greater than the {@code item}.
+   */
+  default int compareTo(@NonNull ITemporalItem item) {
+    return asZonedDateTime().compareTo(item.asZonedDateTime());
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/MarkupLineItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/MarkupLineItemImpl.java
index 1596e8d80..852dba9db 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/MarkupLineItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/MarkupLineItemImpl.java
@@ -33,7 +33,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 class MarkupLineItemImpl
-    extends AbstractAnyAtomicItem<MarkupLine>
+    extends AbstractUntypedAtomicItem<MarkupLine>
     implements IMarkupItem {
 
   public MarkupLineItemImpl(@NonNull MarkupLine value) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/MarkupMultiLineItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/MarkupMultiLineItemImpl.java
index f782a2241..9229d1cb3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/MarkupMultiLineItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/MarkupMultiLineItemImpl.java
@@ -33,7 +33,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 class MarkupMultiLineItemImpl
-    extends AbstractAnyAtomicItem<MarkupMultiline>
+    extends AbstractUntypedAtomicItem<MarkupMultiline>
     implements IMarkupItem {
 
   public MarkupMultiLineItemImpl(@NonNull MarkupMultiline value) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/UuidItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/UuidItemImpl.java
index 261837ec7..99ef11b7b 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/UuidItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/UuidItemImpl.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.datatype.adapter.UuidAdapter;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
 
 import java.util.UUID;
 
@@ -50,4 +51,28 @@ public UUID asUuid() {
   public UuidAdapter getJavaTypeAdapter() {
     return MetaschemaDataTypeProvider.UUID;
   }
+
+  @Override
+  public IMapKey asMapKey() {
+    return new MapKey();
+  }
+
+  private final class MapKey implements IMapKey {
+    @Override
+    public IUuidItem getKey() {
+      return UuidItemImpl.this;
+    }
+
+    @Override
+    public int hashCode() {
+      return getKey().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return this == obj ||
+          (obj instanceof MapKey
+              && getKey().asUuid().equals(((MapKey) obj).getKey().asUuid()));
+    }
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/YearMonthDurationItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/YearMonthDurationItemImpl.java
index 0719cad29..fa40dcfd5 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/YearMonthDurationItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/atomic/YearMonthDurationItemImpl.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.datatype.adapter.YearMonthAdapter;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
 
 import java.time.Period;
 import java.util.Objects;
@@ -52,6 +53,11 @@ public YearMonthAdapter getJavaTypeAdapter() {
     return MetaschemaDataTypeProvider.YEAR_MONTH_DURATION;
   }
 
+  @Override
+  public IMapKey asMapKey() {
+    return new MapKey();
+  }
+
   @Override
   public int hashCode() {
     return Objects.hash(asPeriod());
@@ -63,4 +69,23 @@ public boolean equals(Object obj) {
     return this == obj
         || (obj instanceof IYearMonthDurationItem && compareTo((IYearMonthDurationItem) obj) == 0);
   }
+
+  private final class MapKey implements IMapKey {
+    @Override
+    public IYearMonthDurationItem getKey() {
+      return YearMonthDurationItemImpl.this;
+    }
+
+    @Override
+    public int hashCode() {
+      return getKey().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return this == obj ||
+          (obj instanceof MapKey
+              && getKey().equals(((MapKey) obj).getKey()));
+    }
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/ArrayException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/ArrayException.java
new file mode 100644
index 000000000..70eab5855
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/ArrayException.java
@@ -0,0 +1,101 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.item.function;
+
+import gov.nist.secauto.metaschema.core.metapath.AbstractCodedMetapathException;
+
+/**
+ * Represents an error that occurred while performing mathematical operations.
+ */
+public class ArrayException
+    extends AbstractCodedMetapathException {
+  /**
+   * <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#ERRFOAY0001">err:FOAY0001</a>:
+   * This error is raised when the $length argument to array:subarray is negative.
+   */
+  public static final int INDEX_OUT_OF_BOUNDS = 1;
+  /**
+   * <a href=
+   * "https://www.w3.org/TR/xpath-functions-31/#ERRFOAY0002">err:FOAY0002</a>:
+   * This error is raised whenever numeric operations result in an overflow or
+   * underflow.
+   */
+  public static final int NEGATIVE_ARRAY_LENGTH = 2;
+
+  /**
+   * the serial version UID.
+   */
+  private static final long serialVersionUID = 2L;
+
+  /**
+   * Constructs a new exception with the provided {@code code}, {@code message},
+   * and no cause.
+   *
+   * @param code
+   *          the error code value
+   * @param message
+   *          the exception message
+   */
+  public ArrayException(int code, String message) {
+    super(code, message);
+  }
+
+  /**
+   * Constructs a new exception with the provided {@code code}, {@code message},
+   * and {@code cause}.
+   *
+   * @param code
+   *          the error code value
+   * @param message
+   *          the exception message
+   * @param cause
+   *          the original exception cause
+   */
+  public ArrayException(int code, String message, Throwable cause) {
+    super(code, message, cause);
+  }
+
+  /**
+   * Constructs a new exception with the provided {@code code}, no message, and
+   * the {@code cause}.
+   *
+   * @param code
+   *          the error code value
+   * @param cause
+   *          the original exception cause
+   */
+  public ArrayException(int code, Throwable cause) {
+    super(code, cause);
+  }
+
+  @Override
+  public String getCodePrefix() {
+    return "FOAY";
+  }
+
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItem.java
new file mode 100644
index 000000000..2d81b15d2
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItem.java
@@ -0,0 +1,594 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.item.function;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.IPrintable;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.function.ISequenceType;
+import gov.nist.secauto.metaschema.core.metapath.impl.AbstractArrayItem;
+import gov.nist.secauto.metaschema.core.metapath.impl.ArrayItemN;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
+import java.util.stream.Stream;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A representation of a Metapath array item type.
+ * <p>
+ * Instances of this interface are required to enforce non-mutability for array
+ * contents.
+ *
+ * @param <ITEM>
+ *          the Metapath item type of array members
+ */
+@SuppressWarnings("PMD.ShortMethodName")
+public interface IArrayItem<ITEM extends ICollectionValue> extends IFunction, IItem, List<ITEM>, IPrintable {
+  /**
+   * Get an empty, immutable array item.
+   *
+   * @param <T>
+   *          the item Java type
+   * @return an immutable map item
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> empty() {
+    return AbstractArrayItem.empty();
+  }
+
+  @Override
+  default QName getQName() {
+    return AbstractArrayItem.QNAME;
+  }
+
+  @Override
+  default Set<FunctionProperty> getProperties() {
+    return AbstractArrayItem.PROPERTIES;
+  }
+
+  @Override
+  default boolean isDeterministic() {
+    return true;
+  }
+
+  @Override
+  default boolean isContextDepenent() {
+    return false;
+  }
+
+  @Override
+  default boolean isFocusDepenent() {
+    return false;
+  }
+
+  @Override
+  default List<IArgument> getArguments() {
+    return AbstractArrayItem.ARGUMENTS;
+  }
+
+  @Override
+  default int arity() {
+    return 1;
+  }
+
+  @Override
+  default boolean isArityUnbounded() {
+    return false;
+  }
+
+  @Override
+  default ISequenceType getResult() {
+    return AbstractArrayItem.RESULT;
+  }
+
+  @Override
+  ISequence<?> execute(List<ISequence<?>> arguments, DynamicContext dynamicContext, ISequence<?> focus);
+
+  @Override
+  default String toSignature() {
+    return "array()";
+  }
+
+  @Override
+  List<ITEM> getValue();
+
+  @Override
+  default boolean hasValue() {
+    return true;
+  }
+
+  /**
+   * Determine if this sequence is empty.
+   *
+   * @return {@code true} if the sequence contains no items, or {@code false}
+   *         otherwise
+   */
+  @Override
+  default boolean isEmpty() {
+    return getValue().isEmpty();
+  }
+
+  /**
+   * Get the count of items in this sequence.
+   *
+   * @return the count of items
+   */
+  @Override
+  default int size() {
+    return getValue().size();
+
+  }
+
+  @Override
+  default boolean contains(Object obj) {
+    return getValue().contains(obj);
+  }
+
+  @Override
+  default Object[] toArray() {
+    return getValue().toArray();
+  }
+
+  @Override
+  default <T> T[] toArray(T[] array) {
+    return getValue().toArray(array);
+  }
+
+  @Override
+  default boolean containsAll(Collection<?> collection) {
+    return getValue().containsAll(collection);
+  }
+
+  @Override
+  default ITEM get(int index) {
+    return getValue().get(index);
+  }
+
+  @Override
+  default int indexOf(Object obj) {
+    return getValue().indexOf(obj);
+  }
+
+  @Override
+  default int lastIndexOf(Object obj) {
+    return getValue().lastIndexOf(obj);
+  }
+
+  @Override
+  default ListIterator<ITEM> listIterator() {
+    return getValue().listIterator();
+  }
+
+  @Override
+  default ListIterator<ITEM> listIterator(int index) {
+    return getValue().listIterator(index);
+  }
+
+  @Override
+  default List<ITEM> subList(int fromIndex, int toIndex) {
+    return getValue().subList(fromIndex, toIndex);
+  }
+
+  /**
+   * A {@link Collector} implementation to generates a sequence from a stream of
+   * Metapath items.
+   *
+   * @param <T>
+   *          the Java type of the items
+   * @return a collector that will generate a sequence
+   */
+  @NonNull
+  static <T extends ICollectionValue> Collector<T, ?, IArrayItem<T>> toArrayItem() {
+    return new Collector<T, List<T>, IArrayItem<T>>() {
+
+      @SuppressWarnings("null")
+      @Override
+      public Supplier<List<T>> supplier() {
+        return ArrayList::new;
+      }
+
+      @Override
+      public BiConsumer<List<T>, T> accumulator() {
+        return List::add;
+      }
+
+      @Override
+      public BinaryOperator<List<T>> combiner() {
+        return (list1, list2) -> {
+          list1.addAll(list2);
+          return list1;
+        };
+      }
+
+      @Override
+      public Function<List<T>, IArrayItem<T>> finisher() {
+        return list -> ofCollection(ObjectUtils.notNull(list));
+      }
+
+      @Override
+      public Set<Characteristics> characteristics() {
+        return Collections.emptySet();
+      }
+    };
+  }
+
+  @Override
+  default ISequence<? extends IArrayItem<ITEM>> asSequence() {
+    return ISequence.of(this);
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  default Stream<? extends IItem> flatten() {
+    return stream()
+        .flatMap(ICollectionValue::flatten);
+  }
+
+  /**
+   * Get a new, immutable array item that contains the items in the provided list.
+   *
+   * @param <T>
+   *          the item Java type
+   * @param items
+   *          the list whose items are to be added to the new array
+   * @return an array item containing the specified entries
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> ofCollection( // NOPMD - intentional
+      @NonNull List<T> items) {
+    return items.isEmpty() ? empty() : new ArrayItemN<>(items);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing zero elements.
+   *
+   * @param <T>
+   *          the item type
+   * @return an empty {@code IArrayItem}
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of() {
+    return AbstractArrayItem.empty();
+  }
+
+  /**
+   * Returns an unmodifiable array item containing one item.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param e1
+   *          the single item
+   * @return an {@code IArrayItem} containing the specified item
+   * @throws NullPointerException
+   *           if the item is {@code null}
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of(@NonNull T e1) {
+    return new ArrayItemN<>(e1);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing two items.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @return an {@code IArrayItem} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of(@NonNull T e1, @NonNull T e2) {
+    return new ArrayItemN<>(e1, e2);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing three elements.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @return an {@code IArrayItem} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of(@NonNull T e1, @NonNull T e2, @NonNull T e3) {
+    return new ArrayItemN<>(e1, e2, e3);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing four items.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @return an {@code IArrayItem} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of(@NonNull T e1, @NonNull T e2, @NonNull T e3, @NonNull T e4) {
+    return new ArrayItemN<>(e1, e2, e3, e4);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing five items.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @return an {@code IArrayItem} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of(@NonNull T e1, @NonNull T e2, @NonNull T e3, @NonNull T e4,
+      @NonNull T e5) {
+    return new ArrayItemN<>(e1, e2, e3, e4, e5);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing six items.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @param e6
+   *          the sixth item
+   * @return an {@code IArrayItem} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of(@NonNull T e1, @NonNull T e2, @NonNull T e3, @NonNull T e4,
+      @NonNull T e5, @NonNull T e6) {
+    return new ArrayItemN<>(e1, e2, e3, e4, e5, e6);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing seven items.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @param e6
+   *          the sixth item
+   * @param e7
+   *          the seventh item
+   * @return an {@code IArrayItem} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of(@NonNull T e1, @NonNull T e2, @NonNull T e3, @NonNull T e4,
+      @NonNull T e5, @NonNull T e6, @NonNull T e7) {
+    return new ArrayItemN<>(e1, e2, e3, e4, e5, e6, e7);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing eight items.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @param e6
+   *          the sixth item
+   * @param e7
+   *          the seventh item
+   * @param e8
+   *          the eighth item
+   * @return an {@code IArrayItem} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of(@NonNull T e1, @NonNull T e2, @NonNull T e3, @NonNull T e4,
+      @NonNull T e5, @NonNull T e6, @NonNull T e7, @NonNull T e8) {
+    return new ArrayItemN<>(e1, e2, e3, e4, e5, e6, e7, e8);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing nine items.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @param e6
+   *          the sixth item
+   * @param e7
+   *          the seventh item
+   * @param e8
+   *          the eighth item
+   * @param e9
+   *          the ninth item
+   * @return an {@code IArrayItem} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of(@NonNull T e1, @NonNull T e2, @NonNull T e3, @NonNull T e4,
+      @NonNull T e5, @NonNull T e6, @NonNull T e7, @NonNull T e8, @NonNull T e9) {
+    return new ArrayItemN<>(e1, e2, e3, e4, e5, e6, e7, e8, e9);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing ten items.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param e1
+   *          the first item
+   * @param e2
+   *          the second item
+   * @param e3
+   *          the third item
+   * @param e4
+   *          the fourth item
+   * @param e5
+   *          the fifth item
+   * @param e6
+   *          the sixth item
+   * @param e7
+   *          the seventh item
+   * @param e8
+   *          the eighth item
+   * @param e9
+   *          the ninth item
+   * @param e10
+   *          the tenth item
+   * @return an {@code IArrayItem} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null}
+   */
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of(@NonNull T e1, @NonNull T e2, @NonNull T e3, @NonNull T e4,
+      @NonNull T e5, @NonNull T e6, @NonNull T e7, @NonNull T e8, @NonNull T e9, @NonNull T e10) {
+    return new ArrayItemN<>(e1, e2, e3, e4, e5, e6, e7, e8, e9, e10);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing an arbitrary number of items.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param items
+   *          the items to be contained in the list
+   * @return an {@code IArrayItem} containing the specified items
+   * @throws NullPointerException
+   *           if an item is {@code null} or if the array is {@code null}
+   */
+  @SafeVarargs
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> of(@NonNull T... items) {
+    return items.length == 0 ? empty() : new ArrayItemN<>(items);
+  }
+
+  /**
+   * Returns an unmodifiable array item containing the items of the given
+   * Collection, in its iteration order. The given Collection must not be null,
+   * and it must not contain any null items. If the given Collection is
+   * subsequently modified, the returned array item will not reflect such
+   * modifications.
+   *
+   * @param <T>
+   *          the {@code IArrayItem}'s item type
+   * @param collection
+   *          a {@code Collection} from which items are drawn, must be non-null
+   * @return an {@code IArrayItem} containing the items of the given
+   *         {@code Collection}
+   * @throws NullPointerException
+   *           if collection is null, or if it contains any nulls
+   */
+  @SuppressWarnings("unchecked")
+  @NonNull
+  static <T extends ICollectionValue> IArrayItem<T> copyOf(@NonNull Collection<? extends T> collection) {
+    return collection instanceof IArrayItem
+        ? (IArrayItem<T>) collection
+        : collection.isEmpty()
+            ? empty()
+            : new ArrayItemN<>(new ArrayList<>(collection));
+  }
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceJavaField.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IKeySpecifier.java
similarity index 64%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceJavaField.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IKeySpecifier.java
index 0778d737a..4d0b94554 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceJavaField.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IKeySpecifier.java
@@ -24,37 +24,35 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.impl;
+package gov.nist.secauto.metaschema.core.metapath.item.function;
 
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstance;
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
+import java.util.stream.Stream;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public abstract class AbstractBoundInstanceJavaField<A extends Annotation, P extends IBoundDefinitionModel>
-    extends AbstractBoundAnnotatedJavaField<A>
-    implements IBoundInstance {
-  @NonNull
-  private final P containingDefinition;
-
-  protected AbstractBoundInstanceJavaField(
-      @NonNull Field javaField,
-      @NonNull Class<A> annotationClass,
-      @NonNull P containingDefinition) {
-    super(javaField, annotationClass);
-    this.containingDefinition = containingDefinition;
-  }
-
-  @Override
-  public P getContainingDefinition() {
-    return containingDefinition;
-  }
-
-  @Override
-  public P getParentContainer() {
-    return containingDefinition;
-  }
+/**
+ * A common interface for all key specifier implementations.
+ */
+public interface IKeySpecifier {
+
+  /**
+   * Perform a lookup on the provided target item.
+   *
+   * @param targetItem
+   *          the item to query
+   * @param dynamicContext
+   *          the dynamic context to use for expression evaluation
+   * @param focus
+   *          the focus item for expression evaluation
+   * @return a stream of collection values matching this key specifier
+   */
+  Stream<? extends ICollectionValue> lookup(
+      @NonNull IItem targetItem,
+      @NonNull DynamicContext dynamicContext,
+      @NonNull ISequence<?> focus);
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapItem.java
new file mode 100644
index 000000000..f142cd76e
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapItem.java
@@ -0,0 +1,806 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.item.function;
+
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.ICollectionValue;
+import gov.nist.secauto.metaschema.core.metapath.IPrintable;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.function.ISequenceType;
+import gov.nist.secauto.metaschema.core.metapath.impl.AbstractArrayItem;
+import gov.nist.secauto.metaschema.core.metapath.impl.AbstractMapItem;
+import gov.nist.secauto.metaschema.core.metapath.impl.MapItemN;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * Represents a mapping of {@link IMapKey} keys to values.
+ *
+ * @param <VALUE>
+ *          the value type
+ */
+public interface IMapItem<VALUE extends ICollectionValue>
+    extends IFunction, IItem, Map<IMapKey, VALUE>, IPrintable {
+  /**
+   * Get an empty, immutable map item.
+   *
+   * @param <V>
+   *          the value Java type
+   * @return an immutable map item
+   */
+  @NonNull
+  static <V extends ICollectionValue> IMapItem<V> empty() {
+    return AbstractMapItem.empty();
+  }
+
+  @Override
+  default QName getQName() {
+    return AbstractArrayItem.QNAME;
+  }
+
+  @Override
+  default Set<FunctionProperty> getProperties() {
+    return AbstractArrayItem.PROPERTIES;
+  }
+
+  @Override
+  default boolean isDeterministic() {
+    return true;
+  }
+
+  @Override
+  default boolean isContextDepenent() {
+    return false;
+  }
+
+  @Override
+  default boolean isFocusDepenent() {
+    return false;
+  }
+
+  @Override
+  default List<IArgument> getArguments() {
+    return AbstractArrayItem.ARGUMENTS;
+  }
+
+  @Override
+  default int arity() {
+    return 1;
+  }
+
+  @Override
+  default boolean isArityUnbounded() {
+    return false;
+  }
+
+  @Override
+  default ISequenceType getResult() {
+    return AbstractArrayItem.RESULT;
+  }
+
+  @Override
+  ISequence<?> execute(List<ISequence<?>> arguments, DynamicContext dynamicContext, ISequence<?> focus);
+
+  @Override
+  default String toSignature() {
+    return "array()";
+  }
+
+  @Override
+  Map<IMapKey, VALUE> getValue();
+
+  @Override
+  default boolean hasValue() {
+    return true;
+  }
+
+  /**
+   * Determine if this sequence is empty.
+   *
+   * @return {@code true} if the sequence contains no items, or {@code false}
+   *         otherwise
+   */
+  @Override
+  default boolean isEmpty() {
+    return getValue().isEmpty();
+  }
+
+  /**
+   * Get the count of items in this sequence.
+   *
+   * @return the count of items
+   */
+  @Override
+  default int size() {
+    return getValue().size();
+
+  }
+
+  @Override
+  default ISequence<IMapItem<VALUE>> asSequence() {
+    return ISequence.of(this);
+  }
+
+  /**
+   * Get a new, immutable map item that contains the items in the provided map.
+   *
+   * @param <V>
+   *          the value Java type
+   * @param map
+   *          the map whose items are to be added to the new map
+   * @return a map item containing the specified entries
+   */
+  @NonNull
+  static <V extends ICollectionValue> IMapItem<V> ofCollection( // NOPMD - intentional
+      @NonNull Map<IMapKey, V> map) {
+    return map.isEmpty() ? empty() : new MapItemN<>(map);
+  }
+
+  /**
+   * Returns an unmodifiable map item containing zero mappings.
+   *
+   * @param <V>
+   *          the value Java type
+   * @return an empty {@code IMapItem}
+   */
+  @SuppressWarnings("PMD.ShortMethodName")
+  @NonNull
+  static <V extends ICollectionValue> IMapItem<V> of() {
+    return AbstractMapItem.empty();
+  }
+
+  /**
+   * Returns an unmodifiable map item containing a single mapping.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param k1
+   *          the mapping's key
+   * @param v1
+   *          the mapping's value
+   * @return a map item containing the specified mapping
+   * @throws NullPointerException
+   *           if the key or the value is {@code null}
+   */
+  @SuppressWarnings("PMD.ShortMethodName")
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue> IMapItem<V> of(@NonNull K k1, @NonNull V v1) {
+    return new MapItemN<>(entry(k1, v1));
+  }
+
+  /**
+   * Returns an unmodifiable map item containing two mappings.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param k1
+   *          the first mapping's key
+   * @param v1
+   *          the first mapping's value
+   * @param k2
+   *          the second mapping's key
+   * @param v2
+   *          the second mapping's value
+   * @return a map item containing the specified mappings
+   * @throws IllegalArgumentException
+   *           if the keys are duplicates
+   * @throws NullPointerException
+   *           if any key or value is {@code null}
+   */
+  @SuppressWarnings("PMD.ShortMethodName")
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue> IMapItem<V> of(
+      @NonNull K k1, @NonNull V v1,
+      @NonNull K k2, @NonNull V v2) {
+    return new MapItemN<>(
+        entry(k1, v1),
+        entry(k2, v2));
+  }
+
+  /**
+   * Returns an unmodifiable map item containing three mappings.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param k1
+   *          the first mapping's key
+   * @param v1
+   *          the first mapping's value
+   * @param k2
+   *          the second mapping's key
+   * @param v2
+   *          the second mapping's value
+   * @param k3
+   *          the third mapping's key
+   * @param v3
+   *          the third mapping's value
+   * @return a map item containing the specified mappings
+   * @throws IllegalArgumentException
+   *           if there are any duplicate keys
+   * @throws NullPointerException
+   *           if any key or value is {@code null}
+   */
+  @SuppressWarnings("PMD.ShortMethodName")
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue>
+      IMapItem<V> of(
+          @NonNull K k1, @NonNull V v1,
+          @NonNull K k2, @NonNull V v2,
+          @NonNull K k3, @NonNull V v3) {
+    return new MapItemN<>(
+        entry(k1, v1),
+        entry(k2, v2),
+        entry(k3, v3));
+  }
+
+  /**
+   * Returns an unmodifiable map item containing four mappings.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param k1
+   *          the first mapping's key
+   * @param v1
+   *          the first mapping's value
+   * @param k2
+   *          the second mapping's key
+   * @param v2
+   *          the second mapping's value
+   * @param k3
+   *          the third mapping's key
+   * @param v3
+   *          the third mapping's value
+   * @param k4
+   *          the fourth mapping's key
+   * @param v4
+   *          the fourth mapping's value
+   * @return a map item containing the specified mappings
+   * @throws IllegalArgumentException
+   *           if there are any duplicate keys
+   * @throws NullPointerException
+   *           if any key or value is {@code null}
+   */
+  @SuppressWarnings("PMD.ShortMethodName")
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue>
+      IMapItem<V> of(
+          @NonNull K k1, @NonNull V v1,
+          @NonNull K k2, @NonNull V v2,
+          @NonNull K k3, @NonNull V v3,
+          @NonNull K k4, @NonNull V v4) {
+    return new MapItemN<>(
+        entry(k1, v1),
+        entry(k2, v2),
+        entry(k3, v3),
+        entry(k4, v4));
+  }
+
+  /**
+   * Returns an unmodifiable map item containing five mappings.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param k1
+   *          the first mapping's key
+   * @param v1
+   *          the first mapping's value
+   * @param k2
+   *          the second mapping's key
+   * @param v2
+   *          the second mapping's value
+   * @param k3
+   *          the third mapping's key
+   * @param v3
+   *          the third mapping's value
+   * @param k4
+   *          the fourth mapping's key
+   * @param v4
+   *          the fourth mapping's value
+   * @param k5
+   *          the fifth mapping's key
+   * @param v5
+   *          the fifth mapping's value
+   * @return a map item containing the specified mappings
+   * @throws IllegalArgumentException
+   *           if there are any duplicate keys
+   * @throws NullPointerException
+   *           if any key or value is {@code null}
+   */
+  @SuppressWarnings("PMD.ShortMethodName")
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue>
+      IMapItem<V> of(
+          @NonNull K k1, @NonNull V v1,
+          @NonNull K k2, @NonNull V v2,
+          @NonNull K k3, @NonNull V v3,
+          @NonNull K k4, @NonNull V v4,
+          @NonNull K k5, @NonNull V v5) {
+    return new MapItemN<>(
+        entry(k1, v1),
+        entry(k2, v2),
+        entry(k3, v3),
+        entry(k4, v4),
+        entry(k5, v5));
+  }
+
+  /**
+   * Returns an unmodifiable map item containing six mappings.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param k1
+   *          the first mapping's key
+   * @param v1
+   *          the first mapping's value
+   * @param k2
+   *          the second mapping's key
+   * @param v2
+   *          the second mapping's value
+   * @param k3
+   *          the third mapping's key
+   * @param v3
+   *          the third mapping's value
+   * @param k4
+   *          the fourth mapping's key
+   * @param v4
+   *          the fourth mapping's value
+   * @param k5
+   *          the fifth mapping's key
+   * @param v5
+   *          the fifth mapping's value
+   * @param k6
+   *          the sixth mapping's key
+   * @param v6
+   *          the sixth mapping's value
+   * @return a map item containing the specified mappings
+   * @throws IllegalArgumentException
+   *           if there are any duplicate keys
+   * @throws NullPointerException
+   *           if any key or value is {@code null}
+   */
+  @SuppressWarnings({
+      "PMD.ExcessiveParameterList",
+      "PMD.ShortMethodName"
+  })
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue>
+      IMapItem<V> of(
+          @NonNull K k1, @NonNull V v1,
+          @NonNull K k2, @NonNull V v2,
+          @NonNull K k3, @NonNull V v3,
+          @NonNull K k4, @NonNull V v4,
+          @NonNull K k5, @NonNull V v5,
+          @NonNull K k6, @NonNull V v6) {
+    return new MapItemN<>(
+        entry(k1, v1),
+        entry(k2, v2),
+        entry(k3, v3),
+        entry(k4, v4),
+        entry(k5, v5),
+        entry(k6, v6));
+  }
+
+  /**
+   * Returns an unmodifiable map item containing seven mappings.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param k1
+   *          the first mapping's key
+   * @param v1
+   *          the first mapping's value
+   * @param k2
+   *          the second mapping's key
+   * @param v2
+   *          the second mapping's value
+   * @param k3
+   *          the third mapping's key
+   * @param v3
+   *          the third mapping's value
+   * @param k4
+   *          the fourth mapping's key
+   * @param v4
+   *          the fourth mapping's value
+   * @param k5
+   *          the fifth mapping's key
+   * @param v5
+   *          the fifth mapping's value
+   * @param k6
+   *          the sixth mapping's key
+   * @param v6
+   *          the sixth mapping's value
+   * @param k7
+   *          the seventh mapping's key
+   * @param v7
+   *          the seventh mapping's value
+   * @return a map item containing the specified mappings
+   * @throws IllegalArgumentException
+   *           if there are any duplicate keys
+   * @throws NullPointerException
+   *           if any key or value is {@code null}
+   */
+  @SuppressWarnings({
+      "PMD.ExcessiveParameterList",
+      "PMD.ShortMethodName"
+  })
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue> IMapItem<V> of(
+      @NonNull K k1, @NonNull V v1,
+      @NonNull K k2, @NonNull V v2,
+      @NonNull K k3, @NonNull V v3,
+      @NonNull K k4, @NonNull V v4,
+      @NonNull K k5, @NonNull V v5,
+      @NonNull K k6, @NonNull V v6,
+      @NonNull K k7, @NonNull V v7) {
+    return new MapItemN<>(
+        entry(k1, v1),
+        entry(k2, v2),
+        entry(k3, v3),
+        entry(k4, v4),
+        entry(k5, v5),
+        entry(k6, v6),
+        entry(k7, v7));
+  }
+
+  /**
+   * Returns an unmodifiable map item containing eight mappings. See
+   * <a href="#unmodifiable">Unmodifiable Maps</a> for details.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param k1
+   *          the first mapping's key
+   * @param v1
+   *          the first mapping's value
+   * @param k2
+   *          the second mapping's key
+   * @param v2
+   *          the second mapping's value
+   * @param k3
+   *          the third mapping's key
+   * @param v3
+   *          the third mapping's value
+   * @param k4
+   *          the fourth mapping's key
+   * @param v4
+   *          the fourth mapping's value
+   * @param k5
+   *          the fifth mapping's key
+   * @param v5
+   *          the fifth mapping's value
+   * @param k6
+   *          the sixth mapping's key
+   * @param v6
+   *          the sixth mapping's value
+   * @param k7
+   *          the seventh mapping's key
+   * @param v7
+   *          the seventh mapping's value
+   * @param k8
+   *          the eighth mapping's key
+   * @param v8
+   *          the eighth mapping's value
+   * @return a map item containing the specified mappings
+   * @throws IllegalArgumentException
+   *           if there are any duplicate keys
+   * @throws NullPointerException
+   *           if any key or value is {@code null}
+   */
+  @SuppressWarnings({
+      "PMD.ExcessiveParameterList",
+      "PMD.ShortMethodName"
+  })
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue>
+      IMapItem<V> of(
+          @NonNull K k1, @NonNull V v1,
+          @NonNull K k2, @NonNull V v2,
+          @NonNull K k3, @NonNull V v3,
+          @NonNull K k4, @NonNull V v4,
+          @NonNull K k5, @NonNull V v5,
+          @NonNull K k6, @NonNull V v6,
+          @NonNull K k7, @NonNull V v7,
+          @NonNull K k8, @NonNull V v8) {
+    return new MapItemN<>(
+        entry(k1, v1),
+        entry(k2, v2),
+        entry(k3, v3),
+        entry(k4, v4),
+        entry(k5, v5),
+        entry(k6, v6),
+        entry(k7, v7),
+        entry(k8, v8));
+  }
+
+  /**
+   * Returns an unmodifiable map item containing nine mappings.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param k1
+   *          the first mapping's key
+   * @param v1
+   *          the first mapping's value
+   * @param k2
+   *          the second mapping's key
+   * @param v2
+   *          the second mapping's value
+   * @param k3
+   *          the third mapping's key
+   * @param v3
+   *          the third mapping's value
+   * @param k4
+   *          the fourth mapping's key
+   * @param v4
+   *          the fourth mapping's value
+   * @param k5
+   *          the fifth mapping's key
+   * @param v5
+   *          the fifth mapping's value
+   * @param k6
+   *          the sixth mapping's key
+   * @param v6
+   *          the sixth mapping's value
+   * @param k7
+   *          the seventh mapping's key
+   * @param v7
+   *          the seventh mapping's value
+   * @param k8
+   *          the eighth mapping's key
+   * @param v8
+   *          the eighth mapping's value
+   * @param k9
+   *          the ninth mapping's key
+   * @param v9
+   *          the ninth mapping's value
+   * @return a map item containing the specified mappings
+   * @throws IllegalArgumentException
+   *           if there are any duplicate keys
+   * @throws NullPointerException
+   *           if any key or value is {@code null}
+   */
+  @SuppressWarnings({
+      "PMD.ExcessiveParameterList",
+      "PMD.ShortMethodName"
+  })
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue>
+      IMapItem<V> of(
+          @NonNull K k1, @NonNull V v1,
+          @NonNull K k2, @NonNull V v2,
+          @NonNull K k3, @NonNull V v3,
+          @NonNull K k4, @NonNull V v4,
+          @NonNull K k5, @NonNull V v5,
+          @NonNull K k6, @NonNull V v6,
+          @NonNull K k7, @NonNull V v7,
+          @NonNull K k8, @NonNull V v8,
+          @NonNull K k9, @NonNull V v9) {
+    return new MapItemN<>(entry(k1, v1), entry(k2, v2), entry(k3, v3), entry(k4, v4), entry(k5, v5), entry(k6, v6),
+        entry(k7, v7), entry(k8, v8), entry(k9, v9));
+  }
+
+  /**
+   * Returns an unmodifiable map item containing ten mappings.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param k1
+   *          the first mapping's key
+   * @param v1
+   *          the first mapping's value
+   * @param k2
+   *          the second mapping's key
+   * @param v2
+   *          the second mapping's value
+   * @param k3
+   *          the third mapping's key
+   * @param v3
+   *          the third mapping's value
+   * @param k4
+   *          the fourth mapping's key
+   * @param v4
+   *          the fourth mapping's value
+   * @param k5
+   *          the fifth mapping's key
+   * @param v5
+   *          the fifth mapping's value
+   * @param k6
+   *          the sixth mapping's key
+   * @param v6
+   *          the sixth mapping's value
+   * @param k7
+   *          the seventh mapping's key
+   * @param v7
+   *          the seventh mapping's value
+   * @param k8
+   *          the eighth mapping's key
+   * @param v8
+   *          the eighth mapping's value
+   * @param k9
+   *          the ninth mapping's key
+   * @param v9
+   *          the ninth mapping's value
+   * @param k10
+   *          the tenth mapping's key
+   * @param v10
+   *          the tenth mapping's value
+   * @return a map item containing the specified mappings
+   * @throws IllegalArgumentException
+   *           if there are any duplicate keys
+   * @throws NullPointerException
+   *           if any key or value is {@code null}
+   */
+  @SuppressWarnings({
+      "PMD.ExcessiveParameterList",
+      "PMD.ShortMethodName"
+  })
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue> IMapItem<V> of(
+      @NonNull K k1, @NonNull V v1,
+      @NonNull K k2, @NonNull V v2,
+      @NonNull K k3, @NonNull V v3,
+      @NonNull K k4, @NonNull V v4,
+      @NonNull K k5, @NonNull V v5,
+      @NonNull K k6, @NonNull V v6,
+      @NonNull K k7, @NonNull V v7,
+      @NonNull K k8, @NonNull V v8,
+      @NonNull K k9, @NonNull V v9,
+      @NonNull K k10, @NonNull V v10) {
+    return new MapItemN<>(
+        entry(k1, v1),
+        entry(k2, v2),
+        entry(k3, v3),
+        entry(k4, v4),
+        entry(k5, v5),
+        entry(k6, v6),
+        entry(k7, v7),
+        entry(k8, v8),
+        entry(k9, v9),
+        entry(k10, v10));
+  }
+
+  /**
+   * Returns an unmodifiable map item containing keys and values extracted from
+   * the given entries. The entries themselves are not stored in the map.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param entries
+   *          {@code Map.Entry}s containing the keys and values from which the map
+   *          is populated
+   * @return a map item containing the specified mappings
+   * @throws IllegalArgumentException
+   *           if there are any duplicate keys
+   * @throws NullPointerException
+   *           if any entry, key, or value is {@code null}, or if the
+   *           {@code entries} array is {@code null}
+   */
+  @SafeVarargs
+  @SuppressWarnings("varargs")
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue>
+      IMapItem<V> ofEntries(Map.Entry<IMapKey, ? extends V>... entries) {
+    return entries.length == 0 ? empty() : new MapItemN<>(entries);
+  }
+
+  /**
+   * Returns an unmodifiable {@link Entry} containing the given key and value.
+   *
+   * @param <V>
+   *          the value's type
+   * @param key
+   *          the key
+   * @param value
+   *          the value
+   * @return an {@code Map.Entry} containing the specified key and value
+   * @throws NullPointerException
+   *           if the key or value is {@code null}
+   */
+  @NonNull
+  static <V extends ICollectionValue> Map.Entry<IMapKey, V> entry(@NonNull IAnyAtomicItem key, @NonNull V value) {
+    return entry(key.asMapKey(), value);
+  }
+
+  /**
+   * Returns an unmodifiable {@link Entry} containing the given key and value.
+   *
+   * @param <V>
+   *          the value's type
+   * @param key
+   *          the key
+   * @param value
+   *          the value
+   * @return an {@code Map.Entry} containing the specified key and value
+   * @throws NullPointerException
+   *           if the key or value is {@code null}
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  static <V extends ICollectionValue> Map.Entry<IMapKey, V> entry(@NonNull IMapKey key, @NonNull V value) {
+    return Map.entry(key, value);
+  }
+
+  /**
+   * Returns an unmodifiable Map item containing the entries of the given Map. The
+   * given Map must not be null, and it must not contain any null keys or values.
+   * If the given Map is subsequently modified, the returned Map will not reflect
+   * such modifications.
+   *
+   * @param <K>
+   *          the map item's key type
+   * @param <V>
+   *          the map item's value type
+   * @param map
+   *          a map item from which entries are drawn, must be non-null
+   * @return a map item containing the entries of the given {@code Map}
+   * @throws NullPointerException
+   *           if map is null, or if it contains any null keys or values
+   */
+  @SuppressWarnings("unchecked")
+  @NonNull
+  static <K extends IAnyAtomicItem, V extends ICollectionValue>
+      IMapItem<V> copyOf(Map<? extends IMapKey, ? extends V> map) {
+    return map instanceof IMapItem
+        ? (IMapItem<V>) map
+        : map.isEmpty()
+            ? empty()
+            : new MapItemN<>(new LinkedHashMap<>(map));
+  }
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModel.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapKey.java
similarity index 83%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModel.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapKey.java
index 7f300b290..4f588c2f6 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModel.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/function/IMapKey.java
@@ -24,12 +24,19 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema;
+package gov.nist.secauto.metaschema.core.metapath.item.function;
 
-import gov.nist.secauto.metaschema.core.model.IModelInstance;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
 
-public interface IBindingInstanceModel extends IModelInstance, IBindingInstance {
+import edu.umd.cs.findbugs.annotations.NonNull;
 
-  @Override
-  IBindingDefinitionAssembly getContainingDefinition();
+public interface IMapKey {
+
+  /**
+   * Get the atomic item used as the key.
+   *
+   * @return the atomic item
+   */
+  @NonNull
+  IAnyAtomicItem getKey();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java
index 067568f7a..5813fe1bf 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java
@@ -30,8 +30,6 @@
 import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 
-import java.net.URI;
-
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -72,11 +70,6 @@ public IFlagInstance getInstance() {
     return parent;
   }
 
-  @Override
-  public URI getBaseUri() {
-    return getDefinition().getContainingModule().getLocation();
-  }
-
   @Override
   public String toString() {
     StringBuilder builder = new StringBuilder()
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java
index a77577f63..593a33ad2 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java
@@ -44,6 +44,8 @@
 import java.net.URI;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -142,7 +144,7 @@ public IAssemblyNodeItem newAssemblyNodeItem(
     IAssemblyNodeItem retval = null;
     if (!instance.getDefinition().isInline()) {
       // if not inline, need to check for a cycle
-      IAssemblyNodeItem cycle = getCycledInstance(instance.getEffectiveName(), instance.getDefinition(), parent);
+      IAssemblyNodeItem cycle = getCycledInstance(instance.getXmlQName(), instance.getDefinition(), parent);
       if (cycle != null) {
         // generate a cycle wrapper of the original node item
         retval = new CycledAssemblyInstanceNodeItemImpl(instance, parent, cycle);
@@ -166,18 +168,18 @@ public IAssemblyNodeItem newAssemblyNodeItem(
 
   @Nullable
   private IAssemblyNodeItem getCycledInstance(
-      @NonNull String effectiveName,
+      @NonNull QName name,
       @NonNull IAssemblyDefinition definition,
       @NonNull IAssemblyNodeItem parent) {
     IAssemblyNodeItem retval = null;
 
     IAssemblyDefinition parentDefinition = parent.getDefinition();
-    if (parent.getName().equals(effectiveName) && parentDefinition.equals(definition)) {
+    if (parent.getName().equals(name) && parentDefinition.equals(definition)) {
       retval = parent;
     } else {
       IAssemblyNodeItem ancestor = parent.getParentContentNodeItem();
       if (ancestor != null) {
-        retval = getCycledInstance(effectiveName, definition, ancestor);
+        retval = getCycledInstance(name, definition, ancestor);
       }
     }
     return retval;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/IXmlModule.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitor.java
similarity index 56%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/IXmlModule.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitor.java
index d93b289ba..73470b52f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/IXmlModule.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitor.java
@@ -24,20 +24,41 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.model.xml;
+package gov.nist.secauto.metaschema.core.metapath.item.node;
 
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
-import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
-import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
-import gov.nist.secauto.metaschema.core.model.IModelDefinition;
-import gov.nist.secauto.metaschema.core.model.IModuleExtended;
 
-public interface IXmlModule
-    extends IModuleExtended<
-        IXmlModule,
-        IModelDefinition,
-        IFlagDefinition,
-        IFieldDefinition,
-        IAssemblyDefinition> {
-  // no additional methods
+public abstract class AbstractRecursionPreventingNodeItemVisitor<CONTEXT, RESULT>
+    extends AbstractNodeItemVisitor<CONTEXT, RESULT> {
+
+  @Override
+  public RESULT visitAssembly(IAssemblyNodeItem item, CONTEXT context) {
+    // only walk new records to avoid looping
+    // check if this item's definition is the same as an ancestor's
+    return isDecendant(item, item.getDefinition())
+        ? defaultResult()
+        : super.visitAssembly(item, context);
+  }
+
+  /**
+   * Determines if the provided node is a descendant of the assembly definition.
+   *
+   * @param node
+   *          the node item to test
+   * @param assemblyDefinition
+   *          the assembly definition to determine as an ancestor of the node
+   * @return {@code true} if the assembly definition is the node's ancestor, or
+   *         {@code false} otherwise
+   */
+  protected boolean isDecendant(IAssemblyNodeItem node, IAssemblyDefinition assemblyDefinition) {
+    return node.ancestor()
+        .map(ancestor -> {
+          boolean retval = false;
+          if (ancestor instanceof IAssemblyNodeItem) {
+            IAssemblyDefinition ancestorDef = ((IAssemblyNodeItem) ancestor).getDefinition();
+            retval = ancestorDef.equals(assemblyDefinition);
+          }
+          return retval;
+        }).anyMatch(value -> value);
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java
index 8b7ef1e64..ab058c0c6 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java
@@ -32,6 +32,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 class CycledAssemblyInstanceNodeItemImpl
@@ -70,7 +72,7 @@ public Collection<? extends IFlagNodeItem> getFlags() {
   }
 
   @Override
-  public IFlagNodeItem getFlagByName(@NonNull String name) {
+  public IFlagNodeItem getFlagByName(@NonNull QName name) {
     return getCycledNodeItem().getFlagByName(name);
   }
 
@@ -80,7 +82,7 @@ public IFlagNodeItem getFlagByName(@NonNull String name) {
   }
 
   @Override
-  public List<? extends IModelNodeItem<?, ?>> getModelItemsByName(String name) {
+  public List<? extends IModelNodeItem<?, ?>> getModelItemsByName(QName name) {
     return getCycledNodeItem().getModelItemsByName(name);
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java
index 910cbb098..ee0a95cad 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java
@@ -30,7 +30,6 @@
 import gov.nist.secauto.metaschema.core.metapath.item.node.IFeatureModelContainerItem.ModelContainer;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped;
 import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
-import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.IModelInstance;
 import gov.nist.secauto.metaschema.core.model.IModule;
@@ -45,12 +44,16 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+@SuppressWarnings("PMD.CouplingBetweenObjects")
 final class DefaultNodeItemFactory
     extends AbstractNodeItemFactory {
   @NonNull
@@ -74,7 +77,7 @@ private DefaultNodeItemFactory() {
   @NonNull
   public Supplier<FlagContainer> newDataModelSupplier(@NonNull IFieldNodeItem item) {
     return () -> {
-      Map<String, IFlagNodeItem> flags = generateFlags(item);
+      Map<QName, IFlagNodeItem> flags = generateFlags(item);
       return new FlagContainer(flags);
     };
   }
@@ -83,8 +86,8 @@ public Supplier<FlagContainer> newDataModelSupplier(@NonNull IFieldNodeItem item
   @NonNull
   public Supplier<ModelContainer> newDataModelSupplier(@NonNull IAssemblyNodeItem item) {
     return () -> {
-      Map<String, IFlagNodeItem> flags = generateFlags(item);
-      Map<String, List<? extends IModelNodeItem<?, ?>>> modelItems = generateModelItems(item);
+      Map<QName, IFlagNodeItem> flags = generateFlags(item);
+      Map<QName, List<? extends IModelNodeItem<?, ?>>> modelItems = generateModelItems(item);
       return new ModelContainer(flags, modelItems);
     };
   }
@@ -92,7 +95,7 @@ public Supplier<ModelContainer> newDataModelSupplier(@NonNull IAssemblyNodeItem
   @Override
   public Supplier<ModelContainer> newDataModelSupplier(IRootAssemblyNodeItem item) {
     return () -> {
-      Map<String, List<? extends IModelNodeItem<?, ?>>> modelItems = CollectionUtil.singletonMap(
+      Map<QName, List<? extends IModelNodeItem<?, ?>>> modelItems = CollectionUtil.singletonMap(
           item.getName(),
           CollectionUtil.singletonList(item));
       return new ModelContainer(CollectionUtil.emptyMap(), modelItems);
@@ -109,8 +112,8 @@ public Supplier<ModelContainer> newDataModelSupplier(IRootAssemblyNodeItem item)
    */
   @SuppressWarnings("PMD.UseConcurrentHashMap") // need an ordered Map
   @NonNull
-  protected Map<String, IFlagNodeItem> generateFlags(@NonNull IModelNodeItem<?, ?> parent) {
-    Map<String, IFlagNodeItem> retval = new LinkedHashMap<>();
+  protected Map<QName, IFlagNodeItem> generateFlags(@NonNull IModelNodeItem<?, ?> parent) {
+    Map<QName, IFlagNodeItem> retval = new LinkedHashMap<>();
 
     Object parentValue = parent.getValue();
     assert parentValue != null;
@@ -118,7 +121,7 @@ protected Map<String, IFlagNodeItem> generateFlags(@NonNull IModelNodeItem<?, ?>
       Object flagValue = instance.getValue(parentValue);
       if (flagValue != null) {
         IFlagNodeItem item = newFlagNodeItem(instance, parent, flagValue);
-        retval.put(instance.getEffectiveName(), item);
+        retval.put(instance.getXmlQName(), item);
       }
     }
     return retval.isEmpty() ? CollectionUtil.emptyMap() : CollectionUtil.unmodifiableMap(retval);
@@ -132,10 +135,10 @@ protected Map<String, IFlagNodeItem> generateFlags(@NonNull IModelNodeItem<?, ?>
    *          the parent assembly containing model instances
    * @return a mapping of model instance name to model node item(s)
    */
-  @SuppressWarnings("PMD.UseConcurrentHashMap") // need an ordered map
+  @SuppressWarnings({ "PMD.UseConcurrentHashMap", "PMD.CognitiveComplexity" }) // need an ordered map
   @NonNull
-  protected Map<String, List<? extends IModelNodeItem<?, ?>>> generateModelItems(@NonNull IAssemblyNodeItem parent) {
-    Map<String, List<? extends IModelNodeItem<?, ?>>> retval = new LinkedHashMap<>();
+  protected Map<QName, List<? extends IModelNodeItem<?, ?>>> generateModelItems(@NonNull IAssemblyNodeItem parent) {
+    Map<QName, List<? extends IModelNodeItem<?, ?>>> retval = new LinkedHashMap<>();
 
     Object parentValue = parent.getValue();
     assert parentValue != null;
@@ -144,42 +147,40 @@ protected Map<String, IFlagNodeItem> generateFlags(@NonNull IModelNodeItem<?, ?>
         INamedModelInstanceAbsolute namedInstance = (INamedModelInstanceAbsolute) instance;
 
         Object instanceValue = namedInstance.getValue(parentValue);
-
-        // the item values will be all non-null items
-        Stream<? extends Object> itemValues = namedInstance.getItemValues(instanceValue).stream();
-        AtomicInteger index = new AtomicInteger(); // NOPMD - intentional
-        List<IModelNodeItem<?, ?>> items = itemValues.map(itemValue -> {
-          assert itemValue != null;
-          return newModelItem(namedInstance, parent, index.incrementAndGet(), itemValue);
-        }).collect(Collectors.toUnmodifiableList());
-        retval.put(namedInstance.getEffectiveName(), items);
+        if (instanceValue != null) {
+          List<IModelNodeItem<?, ?>> items = generateModelInstanceItems(
+              parent,
+              namedInstance,
+              ObjectUtils.notNull(namedInstance.getItemValues(instanceValue).stream()));
+          retval.put(namedInstance.getXmlQName(), items);
+        }
       } else if (instance instanceof IChoiceGroupInstance) {
         IChoiceGroupInstance choiceInstance = (IChoiceGroupInstance) instance;
 
         Object instanceValue = choiceInstance.getValue(parentValue);
-
-        Map<INamedModelInstanceGrouped, List<Object>> instanceMap = choiceInstance.getItemValues(instanceValue).stream()
-            .map(item -> {
-              assert item != null;
-              INamedModelInstanceGrouped itemInstance = choiceInstance.getItemInstance(item);
-              return Map.entry(itemInstance, item);
-            })
-            .collect(Collectors.groupingBy(
-                entry -> entry.getKey(),
-                LinkedHashMap::new,
-                Collectors.mapping(entry -> entry.getValue(), Collectors.toUnmodifiableList())));
-
-        for (Map.Entry<INamedModelInstanceGrouped, List<Object>> entry : instanceMap.entrySet()) {
-          INamedModelInstanceGrouped namedInstance = entry.getKey();
-          assert namedInstance != null;
-
-          AtomicInteger index = new AtomicInteger(); // NOPMD - intentional
-          List<IModelNodeItem<?, ?>> items = entry.getValue().stream()
-              .map(itemValue -> {
-                assert itemValue != null;
-                return newModelItem(namedInstance, parent, index.incrementAndGet(), itemValue);
-              }).collect(Collectors.toUnmodifiableList());
-          retval.put(namedInstance.getEffectiveName(), items);
+        if (instanceValue != null) {
+          Map<INamedModelInstanceGrouped, List<Object>> instanceMap
+              = choiceInstance.getItemValues(instanceValue).stream()
+                  .map(item -> {
+                    assert item != null;
+                    INamedModelInstanceGrouped itemInstance = choiceInstance.getItemInstance(item);
+                    return Map.entry(itemInstance, item);
+                  })
+                  .collect(Collectors.groupingBy(
+                      entry -> entry.getKey(),
+                      LinkedHashMap::new,
+                      Collectors.mapping(entry -> entry.getValue(), Collectors.toUnmodifiableList())));
+
+          for (Map.Entry<INamedModelInstanceGrouped, List<Object>> entry : instanceMap.entrySet()) {
+            INamedModelInstanceGrouped namedInstance = entry.getKey();
+            assert namedInstance != null;
+
+            List<IModelNodeItem<?, ?>> items = generateModelInstanceItems(
+                parent,
+                namedInstance,
+                ObjectUtils.notNull(entry.getValue().stream()));
+            retval.put(namedInstance.getXmlQName(), items);
+          }
         }
       }
 
@@ -187,18 +188,32 @@ protected Map<String, IFlagNodeItem> generateFlags(@NonNull IModelNodeItem<?, ?>
     return retval.isEmpty() ? CollectionUtil.emptyMap() : CollectionUtil.unmodifiableMap(retval);
   }
 
+  private List<IModelNodeItem<?, ?>> generateModelInstanceItems(
+      @NonNull IAssemblyNodeItem parent,
+      @NonNull INamedModelInstance namedInstance,
+      @NonNull Stream<?> itemValues) {
+    AtomicInteger index = new AtomicInteger(); // NOPMD - intentional
+
+    // the item values will be all non-null items
+    return itemValues.map(itemValue -> {
+      assert itemValue != null;
+      return newModelItem(namedInstance, parent, index.incrementAndGet(), itemValue);
+    }).collect(Collectors.toUnmodifiableList());
+  }
+
   @Override
   public Supplier<ModelContainer> newMetaschemaModelSupplier(@NonNull IModuleNodeItem item) {
     return () -> {
       IModule module = item.getModule();
 
       // build flags from Metaschema definitions
-      Map<String, IFlagNodeItem> flags = ObjectUtils.notNull(
+      Map<QName, IFlagNodeItem> flags = ObjectUtils.notNull(
           Collections.unmodifiableMap(module.getExportedFlagDefinitions().stream()
+              .map(def -> newFlagNodeItem(ObjectUtils.notNull(def), item))
               .collect(
                   Collectors.toMap(
-                      IFlagDefinition::getEffectiveName,
-                      def -> newFlagNodeItem(ObjectUtils.notNull(def), item),
+                      IFlagNodeItem::getName,
+                      Function.identity(),
                       (v1, v2) -> v2,
                       LinkedHashMap::new))));
 
@@ -208,7 +223,7 @@ public Supplier<ModelContainer> newMetaschemaModelSupplier(@NonNull IModuleNodeI
       Stream<IAssemblyNodeItem> assemblyStream = module.getExportedAssemblyDefinitions().stream()
           .map(def -> newAssemblyNodeItem(ObjectUtils.notNull(def), item));
 
-      Map<String, List<? extends IModelNodeItem<?, ?>>> modelItems
+      Map<QName, List<? extends IModelNodeItem<?, ?>>> modelItems
           = ObjectUtils.notNull(Stream.concat(fieldStream, assemblyStream)
               .collect(
                   Collectors.collectingAndThen(
@@ -221,7 +236,7 @@ public Supplier<ModelContainer> newMetaschemaModelSupplier(@NonNull IModuleNodeI
   @Override
   public Supplier<FlagContainer> newMetaschemaModelSupplier(@NonNull IFieldNodeItem item) {
     return () -> {
-      Map<String, IFlagNodeItem> flags = generateMetaschemaFlags(item);
+      Map<QName, IFlagNodeItem> flags = generateMetaschemaFlags(item);
       return new FlagContainer(flags);
     };
   }
@@ -230,34 +245,34 @@ public Supplier<FlagContainer> newMetaschemaModelSupplier(@NonNull IFieldNodeIte
   public Supplier<ModelContainer> newMetaschemaModelSupplier(
       @NonNull IAssemblyNodeItem item) {
     return () -> {
-      Map<String, IFlagNodeItem> flags = generateMetaschemaFlags(item);
-      Map<String, List<? extends IModelNodeItem<?, ?>>> modelItems = generateMetaschemaModelItems(item);
+      Map<QName, IFlagNodeItem> flags = generateMetaschemaFlags(item);
+      Map<QName, List<? extends IModelNodeItem<?, ?>>> modelItems = generateMetaschemaModelItems(item);
       return new ModelContainer(flags, modelItems);
     };
   }
 
   @NonNull
-  protected Map<String, IFlagNodeItem> generateMetaschemaFlags(
+  protected Map<QName, IFlagNodeItem> generateMetaschemaFlags(
       @NonNull IModelNodeItem<?, ?> parent) {
-    Map<String, IFlagNodeItem> retval = new LinkedHashMap<>(); // NOPMD - intentional
+    Map<QName, IFlagNodeItem> retval = new LinkedHashMap<>(); // NOPMD - intentional
 
     for (IFlagInstance instance : parent.getDefinition().getFlagInstances()) {
       assert instance != null;
       IFlagNodeItem item = newFlagNodeItem(instance, parent);
-      retval.put(instance.getEffectiveName(), item);
+      retval.put(instance.getXmlQName(), item);
     }
     return retval.isEmpty() ? CollectionUtil.emptyMap() : CollectionUtil.unmodifiableMap(retval);
   }
 
   @NonNull
-  protected Map<String, List<? extends IModelNodeItem<?, ?>>> generateMetaschemaModelItems(
+  protected Map<QName, List<? extends IModelNodeItem<?, ?>>> generateMetaschemaModelItems(
       @NonNull IAssemblyNodeItem parent) {
-    Map<String, List<? extends IModelNodeItem<?, ?>>> retval = new LinkedHashMap<>(); // NOPMD - intentional
+    Map<QName, List<? extends IModelNodeItem<?, ?>>> retval = new LinkedHashMap<>(); // NOPMD - intentional
 
     for (INamedModelInstance instance : CollectionUtil.toIterable(getNamedModelInstances(parent.getDefinition()))) {
       assert instance != null;
       IModelNodeItem<?, ?> item = newModelItem(instance, parent);
-      retval.put(instance.getEffectiveName(), Collections.singletonList(item));
+      retval.put(instance.getXmlQName(), Collections.singletonList(item));
     }
     return retval.isEmpty() ? CollectionUtil.emptyMap() : CollectionUtil.unmodifiableMap(retval);
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java
index 4fe228440..424069ef3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java
@@ -27,6 +27,7 @@
 package gov.nist.secauto.metaschema.core.metapath.item.node;
 
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.net.URI;
@@ -59,6 +60,11 @@ public IRootAssemblyNodeItem getRootAssemblyNodeItem() {
     return root;
   }
 
+  @Override
+  public URI getNamespace() {
+    return ObjectUtils.notNull(URI.create(getRootAssemblyNodeItem().getName().getNamespaceURI()));
+  }
+
   @Override
   @NonNull
   public URI getDocumentUri() {
@@ -70,4 +76,14 @@ public URI getDocumentUri() {
   public ModelContainer getModel() {
     return model.get();
   }
+
+  @Override
+  public Object getValue() {
+    return getRootAssemblyNodeItem().getValue();
+  }
+
+  @Override
+  public IResourceLocation getLocation() {
+    return getRootAssemblyNodeItem().getLocation();
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java
index bc251175b..2dcae87ce 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java
@@ -56,7 +56,7 @@ public FlagInstanceNodeItemImpl(
       @NonNull Object value) {
     super(instance, parent);
     this.value = value;
-    this.atomicItem = ObjectUtils.notNull(Lazy.lazy(() -> newAtomicItem()));
+    this.atomicItem = ObjectUtils.notNull(Lazy.lazy(this::newAtomicItem));
   }
 
   @Override
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDefinitionNodeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDefinitionNodeItem.java
index 9d1da57d4..6b05f0a09 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDefinitionNodeItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDefinitionNodeItem.java
@@ -28,8 +28,15 @@
 
 import gov.nist.secauto.metaschema.core.model.IDefinition;
 import gov.nist.secauto.metaschema.core.model.INamedInstance;
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import java.net.URI;
+
+import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 public interface IDefinitionNodeItem<D extends IDefinition, I extends INamedInstance> extends INodeItem {
   /**
@@ -38,9 +45,16 @@ public interface IDefinitionNodeItem<D extends IDefinition, I extends INamedInst
    * @return the item's name
    */
   @NonNull
-  default String getName() {
+  default QName getName() {
     I instance = getInstance();
-    return instance == null ? getDefinition().getEffectiveName() : instance.getEffectiveName();
+    return instance == null
+        ? getDefinition().getXmlQName()
+        : instance.getXmlQName();
+  }
+
+  @Override
+  default URI getNamespace() {
+    return ObjectUtils.notNull(URI.create(getName().getNamespaceURI()));
   }
 
   /**
@@ -57,4 +71,11 @@ default String getName() {
    * @return the instance of the segment, or {@code null} if it doesn't have one
    */
   I getInstance();
+
+  @Override
+  @Nullable
+  default IResourceLocation getLocation() {
+    Object value = getValue();
+    return value == null ? null : getDefinition().getLocation(value);
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentNodeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentNodeItem.java
index b7b668ab0..110f3cda1 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentNodeItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IDocumentNodeItem.java
@@ -33,10 +33,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IDocumentNodeItem extends INodeItem, IFeatureNoDataItem {
+public interface IDocumentNodeItem extends INodeItem {
   @Override
   default NodeItemType getNodeItemType() {
     return NodeItemType.DOCUMENT;
@@ -79,7 +81,7 @@ default URI getBaseUri() {
    *          the root item's name to retrieve
    * @return a list of matching root items
    */
-  default List<? extends IRootAssemblyNodeItem> getRootNodeItemByName(@NonNull String name) {
+  default List<? extends IRootAssemblyNodeItem> getRootNodeItemByName(@NonNull QName name) {
     List<? extends IModelNodeItem<?, ?>> result = getModelItemsByName(name);
     return result.stream().flatMap(item -> {
       IRootAssemblyNodeItem retval = null;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java
index f347eeda2..07839baa2 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java
@@ -26,25 +26,33 @@
 
 package gov.nist.secauto.metaschema.core.metapath.item.node;
 
-import gov.nist.secauto.metaschema.core.model.IContainerFlag;
+import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
 /**
  * This mixin interface indicates that the implementation is a {@link INodeItem}
- * that is based on an {@link IContainerFlag}. This means it has flag children.
+ * that is based on an {@link IModelDefinition}. This means it has flag
+ * children.
  * <p>
  * If an implementation may have flag and model children, or model children
  * only, then the {@link IFeatureModelContainerItem} should be used instead.
  */
 public interface IFeatureFlagContainerItem extends INodeItem {
 
+  /**
+   * Get the model implementation that potentially contains flags.
+   *
+   * @return the model
+   */
   @NonNull
   FlagContainer getModel();
 
@@ -54,7 +62,7 @@ default Collection<IFlagNodeItem> getFlags() {
   }
 
   @Override
-  default IFlagNodeItem getFlagByName(@NonNull String name) {
+  default IFlagNodeItem getFlagByName(@NonNull QName name) {
     return getModel().getFlagByName(name);
   }
 
@@ -65,27 +73,48 @@ default IFlagNodeItem getFlagByName(@NonNull String name) {
   }
 
   @Override
-  default List<? extends IModelNodeItem<?, ?>> getModelItemsByName(String name) {
+  default List<? extends IModelNodeItem<?, ?>> getModelItemsByName(QName name) {
     // no model items
     return CollectionUtil.emptyList();
   }
 
   /**
-   * Provides an abstract implementation of a lazy loaded collection of flags.
+   * Provides an abstract implementation of a model that contains a collection of
+   * flags.
    */
   class FlagContainer {
     @NonNull
-    private final Map<String, IFlagNodeItem> flags;
+    private final Map<QName, IFlagNodeItem> flags;
 
-    protected FlagContainer(@NonNull Map<String, IFlagNodeItem> flags) {
+    /**
+     * Initialize the container with the provided collection of flags.
+     *
+     * @param flags
+     *          a flag mapping of qualified name to corresponding
+     *          {@link IFlagNodeItem}
+     */
+    protected FlagContainer(@NonNull Map<QName, IFlagNodeItem> flags) {
       this.flags = flags;
     }
 
+    /**
+     * Get a flag in this container using the associated flag qualified name.
+     *
+     * @param name
+     *          the qualified name of the flag
+     * @return the corresponding flag item or {@code null} if no flag had the
+     *         provided name
+     */
     @Nullable
-    public IFlagNodeItem getFlagByName(@NonNull String name) {
+    public IFlagNodeItem getFlagByName(@NonNull QName name) {
       return flags.get(name);
     }
 
+    /**
+     * Get the flags in this container.
+     *
+     * @return the flags
+     */
     @NonNull
     @SuppressWarnings("null")
     public Collection<IFlagNodeItem> getFlags() {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java
index ded750c66..1a592c121 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java
@@ -32,6 +32,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -49,7 +51,7 @@ public interface IFeatureModelContainerItem extends IFeatureFlagContainerItem {
   }
 
   @Override
-  default List<? extends IModelNodeItem<?, ?>> getModelItemsByName(String name) {
+  default List<? extends IModelNodeItem<?, ?>> getModelItemsByName(QName name) {
     return getModel().getModelItemsByName(name);
   }
 
@@ -58,7 +60,7 @@ public interface IFeatureModelContainerItem extends IFeatureFlagContainerItem {
    */
   class ModelContainer
       extends FlagContainer {
-    private final Map<String, List<? extends IModelNodeItem<?, ?>>> modelItems;
+    private final Map<QName, List<? extends IModelNodeItem<?, ?>>> modelItems;
 
     /**
      * Creates a new collection of flags and model items.
@@ -69,8 +71,8 @@ class ModelContainer
      *          a mapping of model item name to a list of model items
      */
     protected ModelContainer(
-        @NonNull Map<String, IFlagNodeItem> flags,
-        @NonNull Map<String, List<? extends IModelNodeItem<?, ?>>> modelItems) {
+        @NonNull Map<QName, IFlagNodeItem> flags,
+        @NonNull Map<QName, List<? extends IModelNodeItem<?, ?>>> modelItems) {
       super(flags);
       this.modelItems = modelItems;
     }
@@ -83,7 +85,7 @@ protected ModelContainer(
      * @return a lisy of matching model items or {@code null} if no match was found
      */
     @NonNull
-    public List<? extends IModelNodeItem<?, ?>> getModelItemsByName(@NonNull String name) {
+    public List<? extends IModelNodeItem<?, ?>> getModelItemsByName(@NonNull QName name) {
       List<? extends IModelNodeItem<?, ?>> result = modelItems.get(name);
       return result == null ? CollectionUtil.emptyList() : result;
     }
@@ -98,6 +100,5 @@ protected ModelContainer(
     public Collection<List<? extends IModelNodeItem<?, ?>>> getModelItems() {
       return modelItems.values();
     }
-
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionModelNodeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionModelNodeItem.java
index e3b226b0b..a0c6a0317 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionModelNodeItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFeatureOrhpanedDefinitionModelNodeItem.java
@@ -28,7 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.model.IDefinition;
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
-import gov.nist.secauto.metaschema.core.model.INamedInstance;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstance;
 
 /**
  * A mixin interface used to identify that the implementation is a
@@ -44,7 +44,7 @@
  * @param <I>
  *          the type of the instance that could be created from the definition
  */
-interface IFeatureOrhpanedDefinitionModelNodeItem<D extends IModelDefinition, I extends INamedInstance>
+interface IFeatureOrhpanedDefinitionModelNodeItem<D extends IModelDefinition, I extends INamedModelInstance>
     extends IModelNodeItem<D, I>, IFeatureOrhpanedDefinitionNodeItem<D, I> {
 
   @Override
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFlagNodeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFlagNodeItem.java
index 066cf1989..efd4a455e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFlagNodeItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IFlagNodeItem.java
@@ -37,6 +37,8 @@
 import java.util.List;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -80,7 +82,7 @@ default Collection<? extends IFlagNodeItem> getFlags() {
    * FlagContainer do not have flag items. This call should return {@code null}.
    */
   @Override
-  default IFlagNodeItem getFlagByName(@NonNull String name) {
+  default IFlagNodeItem getFlagByName(@NonNull QName name) {
     // a flag does not have flags
     return null;
   }
@@ -112,7 +114,7 @@ default IFlagNodeItem getFlagByName(@NonNull String name) {
    */
   @SuppressWarnings("null")
   @Override
-  default List<? extends IModelNodeItem<?, ?>> getModelItemsByName(String name) {
+  default List<? extends IModelNodeItem<?, ?>> getModelItemsByName(QName name) {
     // a flag does not have model items
     return Collections.emptyList();
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModelNodeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModelNodeItem.java
index 760edd7bb..6f77d7161 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModelNodeItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModelNodeItem.java
@@ -27,9 +27,9 @@
 package gov.nist.secauto.metaschema.core.metapath.item.node;
 
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
-import gov.nist.secauto.metaschema.core.model.INamedInstance;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstance;
 
-public interface IModelNodeItem<D extends IModelDefinition, I extends INamedInstance>
+public interface IModelNodeItem<D extends IModelDefinition, I extends INamedModelInstance>
     extends IDefinitionNodeItem<D, I> {
 
   /**
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModuleNodeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModuleNodeItem.java
index 16f8a14b7..8712c94b6 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModuleNodeItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IModuleNodeItem.java
@@ -41,7 +41,7 @@
  * All definitions in the {@link ModuleScopeEnum#INHERITED} scope. This allows
  * the exported structure of the Metaschema module to be queried.
  */
-public interface IModuleNodeItem extends IDocumentNodeItem {
+public interface IModuleNodeItem extends IDocumentNodeItem, IFeatureNoDataItem {
 
   /**
    * The Metaschema module this item is based on.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItem.java
index 4ef6e3038..6b2c2a71f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItem.java
@@ -29,6 +29,7 @@
 import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter;
 import gov.nist.secauto.metaschema.core.metapath.format.IPathSegment;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.net.URI;
@@ -36,6 +37,8 @@
 import java.util.List;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -118,6 +121,14 @@ static <CLASS> CLASS toValue(@NonNull INodeItem item) {
    */
   URI getBaseUri();
 
+  /**
+   * Get the default namespace for the node.
+   *
+   * @return the URI
+   */
+  @NonNull
+  URI getNamespace();
+
   /**
    * Get the path for this node item as a Metapath.
    *
@@ -228,7 +239,7 @@ default Stream<? extends INodeItem> descendantOrSelf() {
   Collection<? extends IFlagNodeItem> getFlags();
 
   /**
-   * Lookup a flag and value data on this node by it's effective name.
+   * Lookup a flag and value data on this node by it's effective qualified name.
    *
    * @param name
    *          the effective name of the flag
@@ -236,7 +247,7 @@ default Stream<? extends INodeItem> descendantOrSelf() {
    *         was found
    */
   @Nullable
-  IFlagNodeItem getFlagByName(@NonNull String name);
+  IFlagNodeItem getFlagByName(@NonNull QName name);
 
   /**
    * Get the flags and value data associated with this node as a stream.
@@ -277,7 +288,7 @@ default Stream<? extends IFlagNodeItem> flags() {
    *         empty list if an instance with that name is not present
    */
   @NonNull
-  List<? extends IModelNodeItem<?, ?>> getModelItemsByName(@NonNull String name);
+  List<? extends IModelNodeItem<?, ?>> getModelItemsByName(@NonNull QName name);
 
   /**
    * Get the model items (i.e., fields, assemblies) and value data associated this
@@ -288,6 +299,14 @@ default Stream<? extends IFlagNodeItem> flags() {
   @SuppressWarnings("null")
   @NonNull
   default Stream<? extends IModelNodeItem<?, ?>> modelItems() {
-    return getModelItems().stream().flatMap(list -> list.stream());
+    return getModelItems().stream().flatMap(Collection::stream);
   }
+
+  /**
+   * Get the resource location information for the node, if known.
+   *
+   * @return the resource location information, or {@code null} if not known
+   */
+  @Nullable
+  IResourceLocation getLocation();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemGenerator.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemGenerator.java
index 5f849c694..0f0232faa 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemGenerator.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/INodeItemGenerator.java
@@ -35,21 +35,72 @@
 
 public interface INodeItemGenerator {
 
+  /**
+   * Generate the child Metapath node items for the provided item.
+   *
+   * @param item
+   *          the parent item to generate child node items for
+   * @return a container that consisting of the child node items
+   */
   @NonNull
   Supplier<FlagContainer> newDataModelSupplier(@NonNull IFieldNodeItem item);
 
+  /**
+   * Generate the child Metapath node items for the provided item.
+   *
+   * @param item
+   *          the parent item to generate child node items for
+   * @return a container that consisting of the child node items
+   */
   @NonNull
   Supplier<ModelContainer> newDataModelSupplier(@NonNull IAssemblyNodeItem item);
 
+  /**
+   * Generate the child Metapath node items for the provided item.
+   *
+   * @param item
+   *          the parent item to generate child node items for
+   * @return a container that consisting of the child node items
+   */
   @NonNull
   Supplier<ModelContainer> newDataModelSupplier(@NonNull IRootAssemblyNodeItem item);
 
+  /**
+   * Generate the child Metapath node items for the provided item.
+   * <p>
+   * The provided item is based on a Metaschema module and has no associated
+   * value. As a result, the child items will have no associated value.
+   *
+   * @param item
+   *          the parent item to generate child node items for
+   * @return a container that consisting of the child node items
+   */
   @NonNull
   Supplier<FlagContainer> newMetaschemaModelSupplier(@NonNull IFieldNodeItem item);
 
+  /**
+   * Generate the child Metapath node items for the provided item.
+   * <p>
+   * The provided item is based on a Metaschema module and has no associated
+   * value. As a result, the child items will have no associated value.
+   *
+   * @param item
+   *          the parent item to generate child node items for
+   * @return a container that consisting of the child node items
+   */
   @NonNull
   Supplier<ModelContainer> newMetaschemaModelSupplier(@NonNull IAssemblyNodeItem item);
 
+  /**
+   * Generate the child Metapath node items for the provided item.
+   * <p>
+   * The provided item is a Metaschema module and has no associated value. As a
+   * result, the child items will have no associated value.
+   *
+   * @param item
+   *          the parent item to generate child node items for
+   * @return a container that consisting of the child node items
+   */
   @NonNull
   Supplier<ModelContainer> newMetaschemaModelSupplier(@NonNull IModuleNodeItem item);
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java
index d54aa9a27..e13cd1888 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java
@@ -28,7 +28,8 @@
 
 import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstance;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -44,9 +45,7 @@ public interface IRootAssemblyNodeItem extends IAssemblyNodeItem {
    * This overrides the default behavior using the root name for the assembly.
    */
   @Override
-  default String getName() {
-    return ObjectUtils.requireNonNull(getDefinition().getRootName());
-  }
+  QName getName();
 
   /**
    * Get the parent document node item for this root.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java
index b338b5d0b..9d1ad4cf9 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java
@@ -27,8 +27,11 @@
 package gov.nist.secauto.metaschema.core.metapath.item.node;
 
 import gov.nist.secauto.metaschema.core.model.IModule;
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
+import java.net.URI;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import nl.talsmasoftware.lazy4j.Lazy;
 
@@ -47,6 +50,11 @@ public ModuleNodeItemImpl(
     this.model = ObjectUtils.notNull(Lazy.lazy(generator.newMetaschemaModelSupplier(this)));
   }
 
+  @Override
+  public URI getNamespace() {
+    return getModule().getXmlNamespace();
+  }
+
   @Override
   public IModule getModule() {
     return module;
@@ -58,4 +66,9 @@ public ModelContainer getModel() {
     return model.get();
   }
 
+  @Override
+  public IResourceLocation getLocation() {
+    // no location
+    return null;
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java
index ddc22b3ae..9c8207a9d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java
@@ -29,6 +29,8 @@
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import nl.talsmasoftware.lazy4j.Lazy;
 
@@ -82,4 +84,9 @@ public Object getValue() {
   public ModelContainer getModel() {
     return model.get();
   }
+
+  @Override
+  public QName getName() {
+    return ObjectUtils.requireNonNull(getDefinition().getRootXmlQName());
+  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceModelJavaField.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractAssemblyInstance.java
similarity index 51%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceModelJavaField.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractAssemblyInstance.java
index f3b639c9a..b97149178 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceModelJavaField.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractAssemblyInstance.java
@@ -24,62 +24,65 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.impl;
+package gov.nist.secauto.metaschema.core.model;
 
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-import gov.nist.secauto.metaschema.databind.io.BindingException;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
-import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import nl.talsmasoftware.lazy4j.Lazy;
-
-public abstract class AbstractBoundInstanceModelJavaField<A extends Annotation>
-    extends AbstractBoundInstanceJavaField<A, IBoundDefinitionModelAssembly>
-    implements IFeatureInstanceModelGroupAs {
-
-  @NonNull
-  private final Lazy<IModelInstanceCollectionInfo> collectionInfo;
 
-  public AbstractBoundInstanceModelJavaField(
-      @NonNull Field javaField,
-      @NonNull Class<A> annotationClass,
-      @NonNull IBoundDefinitionModelAssembly containingDefinition) {
-    super(javaField, annotationClass, containingDefinition);
-    this.collectionInfo = ObjectUtils.notNull(Lazy.lazy(() -> IModelInstanceCollectionInfo.of(this)));
-  }
+/**
+ * A base class for an assembly that is a member of a containing model.
+ *
+ * @param <PARENT>
+ *          the Java type of the parent model container for this instance
+ * @param <DEFINITION>
+ *          the Java type of the related assembly definition
+ * @param <INSTANCE>
+ *          the Java type of the implementing instance type
+ * @param <PARENT_DEFINITION>
+ *          the Java type of the containing assembly definition
+ */
+public abstract class AbstractAssemblyInstance<
+    PARENT extends IContainerModel,
+    DEFINITION extends IAssemblyDefinition,
+    INSTANCE extends IAssemblyInstance,
+    PARENT_DEFINITION extends IAssemblyDefinition>
+    extends AbstractNamedModelInstance<PARENT, PARENT_DEFINITION>
+    implements IAssemblyInstance, IFeatureDefinitionReferenceInstance<DEFINITION, INSTANCE> {
 
   /**
-   * Gets information about the bound property.
+   * Construct a new assembly instance that is contained with the provided parent
+   * container.
    *
-   * @return the collection information for the bound property
+   * @param parent
+   *          the parent container for this instance
    */
-  @SuppressWarnings("null")
-  @Override
-  @NonNull
-  public IModelInstanceCollectionInfo getCollectionInfo() {
-    return collectionInfo.get();
+  protected AbstractAssemblyInstance(@NonNull PARENT parent) {
+    super(parent);
   }
-  //
-  // @Override
-  // public Object getValue(Object parent) {
-  // return IFeatureInstanceModelGroupAs.super.getValue(parent);
-  // }
 
   @Override
-  public void setValue(Object parentObject, Object value) {
-    IFeatureInstanceModelGroupAs.super.setValue(parentObject, value);
+  public DEFINITION getDefinition() {
+    // this should always be not null
+    return ObjectUtils.asType(ObjectUtils.requireNonNull(
+        getContainingModule()
+            .getScopedAssemblyDefinitionByName(getReferencedDefinitionQName())));
   }
 
+  /**
+   * Generates a "coordinate" string for the assembly instance.
+   *
+   * @return the coordinate
+   */
+  @SuppressWarnings("null")
   @Override
-  public void deepCopy(@NonNull Object fromInstance, @NonNull Object toInstance) throws BindingException {
-    Object value = getValue(fromInstance);
-    if (value != null) {
-      value = getCollectionInfo().deepCopyItems(fromInstance, toInstance);
-    }
-    setValue(toInstance, value);
+  public String toCoordinates() {
+    IDefinition definition = getDefinition();
+    return String.format("assembly instance %s -> %s in module %s (@%d(%d)",
+        getXmlQName(),
+        definition.getDefinitionQName(),
+        getContainingDefinition().getContainingModule().getShortName(),
+        hashCode(),
+        definition.hashCode());
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceGroupInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceGroupInstance.java
new file mode 100644
index 000000000..e4a386b44
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceGroupInstance.java
@@ -0,0 +1,64 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A base class for a choice group that is a member of a containing model.
+ *
+ * @param <PARENT>
+ *          the Java type of the containing assembly definition
+ * @param <NAMED_MODEL>
+ *          the Java type of child named model instances supported by this
+ *          choice group
+ * @param <FIELD>
+ *          the Java type of child field instances supported by this choice
+ *          group
+ * @param <ASSEMBLY>
+ *          the Java type of child assembly instances supported by this choice
+ *          group
+ */
+public abstract class AbstractChoiceGroupInstance<
+    PARENT extends IAssemblyDefinition,
+    NAMED_MODEL extends INamedModelInstanceGrouped,
+    FIELD extends IFieldInstanceGrouped,
+    ASSEMBLY extends IAssemblyInstanceGrouped>
+    extends AbstractInstance<PARENT>
+    implements IChoiceGroupInstance, IFeatureContainerModelGrouped<NAMED_MODEL, FIELD, ASSEMBLY> {
+
+  /**
+   * Construct a new choice group instance that is contained with the provided
+   * parent assembly definition container.
+   *
+   * @param parent
+   *          the parent assembly definition container for this instance
+   */
+  protected AbstractChoiceGroupInstance(@NonNull PARENT parent) {
+    super(parent);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceInstance.java
new file mode 100644
index 000000000..4eb9d2b4f
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractChoiceInstance.java
@@ -0,0 +1,71 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A base class for a choice that is a member of a containing model.
+ *
+ * @param <PARENT>
+ *          the Java type of the containing assembly definition
+ * @param <MODEL>
+ *          the Java type of child model instances supported by this choice
+ * @param <NAMED_MODEL>
+ *          the Java type of child named model instances supported by this
+ *          choice
+ * @param <FIELD>
+ *          the Java type of child field instances supported by this choice
+ * @param <ASSEMBLY>
+ *          the Java type of child assembly instances supported by this choice
+ */
+public abstract class AbstractChoiceInstance<
+    PARENT extends IAssemblyDefinition,
+    MODEL extends IModelInstanceAbsolute,
+    NAMED_MODEL extends INamedModelInstanceAbsolute,
+    FIELD extends IFieldInstanceAbsolute,
+    ASSEMBLY extends IAssemblyInstanceAbsolute>
+    extends AbstractInstance<PARENT>
+    implements IChoiceInstance, IFeatureContainerModelAbsolute<MODEL, NAMED_MODEL, FIELD, ASSEMBLY> {
+
+  /**
+   * Construct a new choice instance that is contained with the provided parent
+   * assembly definition.
+   *
+   * @param parent
+   *          the parent assembly definition container for this instance
+   */
+  protected AbstractChoiceInstance(@NonNull PARENT parent) {
+    super(parent);
+  }
+
+  @Override
+  public String getGroupAsName() {
+    // a choice does not have a groups-as name
+    return null;
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFieldInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFieldInstance.java
new file mode 100644
index 000000000..67f228f70
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFieldInstance.java
@@ -0,0 +1,88 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A base class for a field that is a member of a containing model.
+ *
+ * @param <PARENT>
+ *          the Java type of the parent model (i.e., assembly, choice,
+ *          choiceGroup).
+ * @param <DEFINITION>
+ *          the Java type of the definition for this member field
+ * @param <INSTANCE>
+ *          the Java type of the instance for this member field
+ * @param <PARENT_DEFINITION>
+ *          the Java type of the containing assembly definition
+ */
+public abstract class AbstractFieldInstance<
+    PARENT extends IContainerModel,
+    DEFINITION extends IFieldDefinition,
+    INSTANCE extends IFieldInstance,
+    PARENT_DEFINITION extends IAssemblyDefinition>
+    extends AbstractNamedModelInstance<PARENT, PARENT_DEFINITION>
+    implements IFieldInstance, IFeatureDefinitionReferenceInstance<DEFINITION, INSTANCE> {
+
+  /**
+   * Construct a new field instance.
+   *
+   * @param parent
+   *          the parent model containing this instance
+   */
+  protected AbstractFieldInstance(@NonNull PARENT parent) {
+    super(parent);
+  }
+
+  @Override
+  public DEFINITION getDefinition() {
+    // this should always be not null
+    return ObjectUtils.asType(ObjectUtils.requireNonNull(
+        getContainingModule()
+            .getScopedFieldDefinitionByName(getReferencedDefinitionQName())));
+  }
+
+  /**
+   * Generates a "coordinate" string for the assembly instance.
+   *
+   * @return the coordinate
+   */
+  @SuppressWarnings("null")
+  @Override
+  public String toCoordinates() {
+    IDefinition definition = getDefinition();
+    return String.format("field instance %s -> %s in module %s (@%d(%d)",
+        getXmlQName(),
+        definition.getDefinitionQName(),
+        getContainingDefinition().getContainingModule().getShortName(),
+        hashCode(),
+        definition.hashCode());
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFlagInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFlagInstance.java
new file mode 100644
index 000000000..079de235b
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractFlagInstance.java
@@ -0,0 +1,89 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A base class for a flag that is a member of a containing model.
+ *
+ * @param <PARENT>
+ *          the Java type of the parent model (i.e., assembly, field).
+ * @param <DEFINITION>
+ *          the Java type of the definition for this member flag
+ * @param <INSTANCE>
+ *          the Java type of the instance for this member flag
+ */
+public abstract class AbstractFlagInstance<
+    PARENT extends IModelDefinition,
+    DEFINITION extends IFlagDefinition,
+    INSTANCE extends IFlagInstance>
+    extends AbstractNamedInstance<PARENT>
+    implements IFlagInstance, IFeatureDefinitionReferenceInstance<DEFINITION, INSTANCE> {
+
+  /**
+   * Construct a new flag instance.
+   *
+   * @param parent
+   *          the parent model containing this instance
+   */
+  protected AbstractFlagInstance(@NonNull PARENT parent) {
+    super(parent, name -> parent.getContainingModule().toFlagQName(name));
+  }
+
+  @Override
+  public DEFINITION getDefinition() {
+    // this should always be not null
+    return ObjectUtils.asType(ObjectUtils.requireNonNull(
+        getContainingModule()
+            .getScopedFlagDefinitionByName(getReferencedDefinitionQName())));
+  }
+
+  @Override
+  public final PARENT getContainingDefinition() {
+    return getParentContainer();
+  }
+
+  /**
+   * Generates a "coordinate" string for the assembly instance.
+   *
+   * @return the coordinate
+   */
+  @SuppressWarnings("null")
+  @Override
+  public String toCoordinates() {
+    IDefinition definition = getDefinition();
+    return String.format("flag instance %s -> %s in module %s (@%d(%d)",
+        getXmlQName(),
+        definition.getDefinitionQName(),
+        getContainingDefinition().getContainingModule().getShortName(),
+        hashCode(),
+        definition.hashCode());
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalAssemblyDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalAssemblyDefinition.java
new file mode 100644
index 000000000..69e4f7a12
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalAssemblyDefinition.java
@@ -0,0 +1,82 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A base class for an assembly definition defined globally within a Metaschema
+ * module.
+ *
+ * @param <MODULE>
+ *          the Java type of the containing module
+ * @param <INSTANCE>
+ *          the expected Java type of an instance of this definition
+ * @param <FLAG>
+ *          the expected Java type of flag children
+ * @param <MODEL>
+ *          the expected Java type of model children
+ * @param <NAMED_MODEL>
+ *          the expected Java type of named model children
+ * @param <FIELD>
+ *          the expected Java type of field children
+ * @param <ASSEMBLY>
+ *          the expected Java type of assembly children
+ * @param <CHOICE>
+ *          the expected Java type of choice children
+ * @param <CHOICE_GROUP>
+ *          the expected Java type of choice group children
+ */
+public abstract class AbstractGlobalAssemblyDefinition<
+    MODULE extends IModule,
+    INSTANCE extends IAssemblyInstance,
+    FLAG extends IFlagInstance,
+    MODEL extends IModelInstanceAbsolute,
+    NAMED_MODEL extends INamedModelInstanceAbsolute,
+    FIELD extends IFieldInstanceAbsolute,
+    ASSEMBLY extends IAssemblyInstanceAbsolute,
+    CHOICE extends IChoiceInstance,
+    CHOICE_GROUP extends IChoiceGroupInstance>
+    extends AbstractGlobalDefinition<MODULE, INSTANCE>
+    implements IAssemblyDefinition, IFeatureContainerFlag<FLAG>, IFeatureContainerModelAssembly<
+        MODEL,
+        NAMED_MODEL,
+        FIELD,
+        ASSEMBLY,
+        CHOICE,
+        CHOICE_GROUP> {
+
+  /**
+   * Construct a new global assembly definition.
+   *
+   * @param module
+   *          the parent module containing this definition
+   */
+  protected AbstractGlobalAssemblyDefinition(@NonNull MODULE module) {
+    super(module, module::toModelQName);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalDefinition.java
new file mode 100644
index 000000000..009c66c31
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalDefinition.java
@@ -0,0 +1,111 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import nl.talsmasoftware.lazy4j.Lazy;
+
+/**
+ * A base class for definitions defined globally within a Metaschema module.
+ *
+ * @param <MODULE>
+ *          the Java type of the containing module
+ * @param <INSTANCE>
+ *          the expected Java type of an instance of this definition
+ */
+public abstract class AbstractGlobalDefinition<MODULE extends IModule, INSTANCE extends INamedInstance>
+    implements IDefinition {
+  @NonNull
+  private final MODULE module;
+  @NonNull
+  private final Lazy<QName> qname;
+  @NonNull
+  private final Lazy<QName> definitionQName;
+
+  /**
+   * Construct a new global definition.
+   *
+   * @param module
+   *          the parent module containing this instance
+   * @param initializer
+   *          the callback used to generate qualified names
+   */
+  protected AbstractGlobalDefinition(@NonNull MODULE module, @NonNull NameInitializer initializer) {
+    this.module = module;
+    this.qname = ObjectUtils.notNull(Lazy.lazy(() -> initializer.apply(getEffectiveName())));
+    this.definitionQName = ObjectUtils.notNull(Lazy.lazy(() -> initializer.apply(getName())));
+  }
+
+  @Override
+  public final MODULE getContainingModule() {
+    return module;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public final QName getXmlQName() {
+    return qname.get();
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public final QName getDefinitionQName() {
+    return definitionQName.get();
+  }
+
+  @Override
+  public final boolean isInline() {
+    // never inline
+    return false;
+  }
+
+  @Override
+  public final INSTANCE getInlineInstance() {
+    // never inline
+    return null;
+  }
+
+  /**
+   * Provides a callback for generating a qualified name from a name.
+   */
+  @FunctionalInterface
+  public interface NameInitializer {
+    /**
+     * Produce a qualified name by parsing the provided name.
+     *
+     * @param name
+     *          the name to parse
+     * @return the qualified name for the provided name
+     */
+    @NonNull
+    QName apply(@NonNull String name);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerFlag.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFieldDefinition.java
similarity index 67%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerFlag.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFieldDefinition.java
index ff090f36e..a7feead8e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerFlag.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFieldDefinition.java
@@ -26,40 +26,33 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
-import java.util.Collection;
-
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
 /**
- * This marker interface identifies a type of definition that contains flags,
- * either a field or assembly.
+ * A base class for a field definition defined globally within a Metaschema
+ * module.
  *
+ * @param <MODULE>
+ *          the Java type of the containing module
+ * @param <INSTANCE>
+ *          the expected Java type of an instance of this definition
+ * @param <FLAG>
+ *          the expected Java type of flag children
  */
-public interface IContainerFlag extends IContainer {
-  @Override
-  default boolean hasChildren() {
-    return !getFlagInstances().isEmpty();
-  }
+public abstract class AbstractGlobalFieldDefinition<
+    MODULE extends IModule,
+    INSTANCE extends IFieldInstance,
+    FLAG extends IFlagInstance>
+    extends AbstractGlobalDefinition<MODULE, INSTANCE>
+    implements IFieldDefinition, IFeatureContainerFlag<FLAG> {
 
   /**
-   * Retrieves a flag instance, by the flag's effective name, that is defined on
-   * the containing definition.
+   * Construct a new global field definition.
    *
-   * @param name
-   *          the flag's name
-   * @return the matching flag instance, or {@code null} if there is no flag
-   *         matching the specified name
+   * @param module
+   *          the parent module containing this definition
    */
-  @Nullable
-  IFlagInstance getFlagInstanceByName(@NonNull String name);
-
-  /**
-   * Retrieves the flag instances for all flags defined on the containing
-   * definition.
-   *
-   * @return the flags
-   */
-  @NonNull
-  Collection<? extends IFlagInstance> getFlagInstances();
+  protected AbstractGlobalFieldDefinition(@NonNull MODULE module) {
+    super(module, module::toModelQName);
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFlagDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFlagDefinition.java
new file mode 100644
index 000000000..c3b1262bb
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractGlobalFlagDefinition.java
@@ -0,0 +1,53 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A base class for a flag definition defined globally within a Metaschema
+ * module.
+ *
+ * @param <MODULE>
+ *          the Java type of the containing module
+ * @param <INSTANCE>
+ *          the expected Java type of an instance of this definition
+ */
+public abstract class AbstractGlobalFlagDefinition<MODULE extends IModule, INSTANCE extends IFlagInstance>
+    extends AbstractGlobalDefinition<MODULE, INSTANCE>
+    implements IFlagDefinition {
+
+  /**
+   * Construct a new global flag definition.
+   *
+   * @param module
+   *          the parent module containing this definition
+   */
+  protected AbstractGlobalFlagDefinition(@NonNull MODULE module) {
+    super(module, module::toFlagQName);
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineAssemblyDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineAssemblyDefinition.java
new file mode 100644
index 000000000..42c63e0d8
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineAssemblyDefinition.java
@@ -0,0 +1,107 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A base class for an assembly instance defined inline.
+ *
+ * @param <PARENT>
+ *          the Java type of the parent model container for this instance
+ * @param <DEFINITION>
+ *          the Java type of the related assembly definition
+ * @param <INSTANCE>
+ *          the expected Java type of an instance of this definition
+ * @param <PARENT_DEFINITION>
+ *          the Java type of the containing assembly definition
+ * @param <FLAG>
+ *          the expected Java type of flag children
+ * @param <MODEL>
+ *          the expected Java type of model children
+ * @param <NAMED_MODEL>
+ *          the expected Java type of named model children
+ * @param <FIELD>
+ *          the expected Java type of field children
+ * @param <ASSEMBLY>
+ *          the expected Java type of assembly children
+ * @param <CHOICE>
+ *          the expected Java type of choice children
+ * @param <CHOICE_GROUP>
+ *          the expected Java type of choice group children
+ */
+public abstract class AbstractInlineAssemblyDefinition<
+    PARENT extends IContainerModel,
+    DEFINITION extends IAssemblyDefinition,
+    INSTANCE extends IAssemblyInstance,
+    PARENT_DEFINITION extends IAssemblyDefinition,
+    FLAG extends IFlagInstance,
+    MODEL extends IModelInstanceAbsolute,
+    NAMED_MODEL extends INamedModelInstanceAbsolute,
+    FIELD extends IFieldInstanceAbsolute,
+    ASSEMBLY extends IAssemblyInstanceAbsolute,
+    CHOICE extends IChoiceInstance,
+    CHOICE_GROUP extends IChoiceGroupInstance>
+    extends AbstractNamedModelInstance<PARENT, PARENT_DEFINITION>
+    implements IAssemblyInstance, IAssemblyDefinition, IFeatureContainerFlag<FLAG>,
+    IFeatureContainerModelAssembly<
+        MODEL,
+        NAMED_MODEL,
+        FIELD,
+        ASSEMBLY,
+        CHOICE,
+        CHOICE_GROUP>,
+    IFeatureDefinitionInstanceInlined<DEFINITION, INSTANCE> {
+
+  /**
+   * Construct a new inline assembly definition.
+   *
+   * @param parent
+   *          the parent model containing this instance
+   */
+  protected AbstractInlineAssemblyDefinition(@NonNull PARENT parent) {
+    super(parent);
+  }
+
+  @Override
+  public final DEFINITION getDefinition() {
+    return ObjectUtils.asType(this);
+  }
+
+  @Override
+  @NonNull
+  public final INSTANCE getInlineInstance() {
+    return ObjectUtils.asType(this);
+  }
+
+  @Override
+  public final FLAG getJsonKey() {
+    return IFeatureContainerFlag.super.getJsonKey();
+  }
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingDefinitionInline.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFieldDefinition.java
similarity index 55%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingDefinitionInline.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFieldDefinition.java
index 51726dd86..068673556 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingDefinitionInline.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFieldDefinition.java
@@ -24,40 +24,60 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
+package gov.nist.secauto.metaschema.core.model;
 
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
-import gov.nist.secauto.metaschema.core.model.INamedInstance;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinition;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-// REFACTOR: Try to eliminate this interface in favor of IFeatureInlinedDefinitionInstance
-public interface IFeatureBindingDefinitionInline<
-    DEFINITION extends IBindingDefinition,
-    INSTANCE extends IBindingInstance & INamedInstance>
-    extends IBindingDefinition, IBindingInstance,
+/**
+ * A base class for an assembly instance defined inline.
+ *
+ * @param <PARENT>
+ *          the Java type of the parent model container for this instance
+ * @param <DEFINITION>
+ *          the Java type of the related assembly definition
+ * @param <INSTANCE>
+ *          the expected Java type of an instance of this definition
+ * @param <PARENT_DEFINITION>
+ *          the Java type of the containing assembly definition
+ * @param <FLAG>
+ *          the expected Java type of flag children
+ */
+public abstract class AbstractInlineFieldDefinition<
+    PARENT extends IContainerModel,
+    DEFINITION extends IFieldDefinition,
+    INSTANCE extends IFieldInstance,
+    PARENT_DEFINITION extends IAssemblyDefinition,
+    FLAG extends IFlagInstance>
+    extends AbstractNamedModelInstance<PARENT, PARENT_DEFINITION>
+    implements IFieldInstance, IFieldDefinition,
+    IFeatureContainerFlag<FLAG>,
     IFeatureDefinitionInstanceInlined<DEFINITION, INSTANCE> {
 
+  /**
+   * Construct a new inline assembly definition.
+   *
+   * @param parent
+   *          the parent model containing this instance
+   */
+  protected AbstractInlineFieldDefinition(@NonNull PARENT parent) {
+    super(parent);
+  }
+
+  @Override
+  public final DEFINITION getDefinition() {
+    return ObjectUtils.asType(this);
+  }
+
   @Override
   @NonNull
-  default IBindingModule getContainingModule() {
-    // this is the same as IBoundInstance, but is needed since IBoundDefinition
-    // and IBoundInstance both declare it
-    return getContainingDefinition().getContainingModule();
+  public final INSTANCE getInlineInstance() {
+    return ObjectUtils.asType(this);
   }
 
-  /**
-   * {@inheritDoc}
-   * <p>
-   * Use the effective name of the instance.
-   */
   @Override
-  default String getJsonName() {
-    // this is the same as INamedModelElement, but is needed since IBoundProperty
-    // also declares it
-    return getEffectiveName();
+  public final FLAG getJsonKey() {
+    return IFeatureContainerFlag.super.getJsonKey();
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IFeatureBoundDefinitionInline.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFlagDefinition.java
similarity index 60%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IFeatureBoundDefinitionInline.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFlagDefinition.java
index 9f0f55962..211faaa59 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IFeatureBoundDefinitionInline.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInlineFlagDefinition.java
@@ -24,47 +24,53 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model;
+package gov.nist.secauto.metaschema.core.model;
 
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-// REFACTOR: Try to eliminate this interface in favor of IFeatureInlinedDefinitionInstance
-public interface IFeatureBoundDefinitionInline<
-    DEFINITION extends IBoundDefinition,
-    INSTANCE extends IBoundInstanceNamed>
-    extends IBoundDefinition, IBoundInstanceNamed,
+/**
+ * A base class for an assembly instance defined inline.
+ *
+ * @param <PARENT>
+ *          the Java type of the parent model container for this instance
+ * @param <DEFINITION>
+ *          the Java type of the related assembly definition
+ * @param <INSTANCE>
+ *          the expected Java type of an instance of this definition
+ */
+public abstract class AbstractInlineFlagDefinition<
+    PARENT extends IModelDefinition,
+    DEFINITION extends IFlagDefinition,
+    INSTANCE extends IFlagInstance>
+    extends AbstractNamedInstance<PARENT>
+    implements IFlagInstance, IFlagDefinition,
     IFeatureDefinitionInstanceInlined<DEFINITION, INSTANCE> {
-  //
-  // @Override
-  // default Object getEffectiveDefaultValue() {
-  // // needed to avoid conflict between IBoundInstance and INamedInstance
-  // return IBoundInstanceNamed.super.getDefaultValue();
-  // }
 
   /**
-   * {@inheritDoc}
-   * <p>
-   * Get the containing module from the definition this instance is declared on.
+   * Construct a new inline assembly definition.
+   *
+   * @param parent
+   *          the parent model containing this instance
    */
+  protected AbstractInlineFlagDefinition(@NonNull PARENT parent) {
+    super(parent, name -> parent.getContainingModule().toFlagQName(name));
+  }
+
+  @Override
+  public final DEFINITION getDefinition() {
+    return ObjectUtils.asType(this);
+  }
+
   @Override
   @NonNull
-  default IBoundModule getContainingModule() {
-    // this is the same as IBoundInstance, but is needed since IBoundDefinition
-    // and IBoundInstance both declare it
-    return getContainingDefinition().getContainingModule();
+  public final INSTANCE getInlineInstance() {
+    return ObjectUtils.asType(this);
   }
 
-  /**
-   * {@inheritDoc}
-   * <p>
-   * Use the effective name of the instance.
-   */
   @Override
-  default String getJsonName() {
-    // this is the same as INamedModelElement, but is needed since IBoundProperty
-    // also declares it
-    return getEffectiveName();
+  public PARENT getContainingDefinition() {
+    return getParentContainer();
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInstance.java
index 03154c372..e451ba5e0 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractInstance.java
@@ -27,9 +27,8 @@
 package gov.nist.secauto.metaschema.core.model;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
-public abstract class AbstractInstance<P extends IContainer> implements IInstanceAbsolute {
+public abstract class AbstractInstance<P extends IContainer> implements IInstance {
   @NonNull
   private final P parent;
 
@@ -45,13 +44,7 @@ protected AbstractInstance(@NonNull P parent) {
 
   @Override
   @NonNull
-  public P getParentContainer() {
+  public final P getParentContainer() {
     return parent;
   }
-
-  @Override
-  @Nullable
-  public Object getValue(Object parent) {
-    return getResolvedDefaultValue();
-  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractLoader.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractLoader.java
index dbdd06faf..097080c47 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractLoader.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractLoader.java
@@ -92,7 +92,8 @@ public T load(@NonNull URI resource) throws MetaschemaException, IOException {
   @Override
   @NonNull
   public T load(@NonNull Path path) throws MetaschemaException, IOException {
-    return loadInternal(ObjectUtils.notNull(path.toAbsolutePath().normalize().toUri()), new LinkedList<>());
+    // use toURL to normalize the URI
+    return load(ObjectUtils.notNull(path.toAbsolutePath().normalize().toUri().toURL()));
   }
 
   /**
@@ -148,12 +149,12 @@ protected T loadInternal(@NonNull URI resource, @NonNull Deque<URI> visitedResou
     // first check if the current resource has been visited to prevent cycles
     if (visitedResources.contains(resource)) {
       throw new MetaschemaException("Cycle detected in metaschema includes for '" + resource + "'. Call stack: '"
-          + visitedResources.stream().map(n -> n.toString()).collect(Collectors.joining(",")));
+          + visitedResources.stream().map(URI::toString).collect(Collectors.joining(",")));
     }
 
     T retval = cache.get(resource);
     if (retval == null) {
-      LOGGER.info("Loading module '{}'", resource);
+      LOGGER.info("Loading '{}'", resource);
 
       try {
         visitedResources.push(resource);
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModule.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModule.java
index 8ee1c2cc6..515387585 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModule.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModule.java
@@ -42,6 +42,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.talsmasoftware.lazy4j.Lazy;
@@ -116,7 +118,7 @@ public Collection<FL> getExportedFlagDefinitions() {
   }
 
   @Override
-  public FL getExportedFlagDefinitionByName(String name) {
+  public FL getExportedFlagDefinitionByName(QName name) {
     return getExports().getExportedFlagDefinitionMap().get(name);
   }
 
@@ -127,7 +129,7 @@ public Collection<FI> getExportedFieldDefinitions() {
   }
 
   @Override
-  public FI getExportedFieldDefinitionByName(String name) {
+  public FI getExportedFieldDefinitionByName(QName name) {
     return getExports().getExportedFieldDefinitionMap().get(name);
   }
 
@@ -138,13 +140,20 @@ public Collection<A> getExportedAssemblyDefinitions() {
   }
 
   @Override
-  public A getExportedAssemblyDefinitionByName(String name) {
+  public A getExportedAssemblyDefinitionByName(QName name) {
     return getExports().getExportedAssemblyDefinitionMap().get(name);
   }
 
+  @Override
+  public A getExportedRootAssemblyDefinitionByName(QName name) {
+    return getExports().getExportedRootAssemblyDefinitionMap().get(name);
+  }
+
   @SuppressWarnings({ "unused", "PMD.UnusedPrivateMethod" }) // used by lambda
   private static <DEF extends IDefinition> DEF handleShadowedDefinitions(
-      @SuppressWarnings("unused") @NonNull String key, @NonNull DEF oldDef, @NonNull DEF newDef) {
+      @SuppressWarnings("unused") @NonNull QName key,
+      @NonNull DEF oldDef,
+      @NonNull DEF newDef) {
     if (!oldDef.equals(newDef) && LOGGER.isWarnEnabled()) {
       LOGGER.warn("The {} '{}' from metaschema '{}' is shadowing '{}' from metaschema '{}'",
           newDef.getModelType().name().toLowerCase(Locale.ROOT),
@@ -158,11 +167,13 @@ private static <DEF extends IDefinition> DEF handleShadowedDefinitions(
 
   private class Exports {
     @NonNull
-    private final Map<String, FL> exportedFlagDefinitions;
+    private final Map<QName, FL> exportedFlagDefinitions;
+    @NonNull
+    private final Map<QName, FI> exportedFieldDefinitions;
     @NonNull
-    private final Map<String, FI> exportedFieldDefinitions;
+    private final Map<QName, A> exportedAssemblyDefinitions;
     @NonNull
-    private final Map<String, A> exportedAssemblyDefinitions;
+    private final Map<QName, A> exportedRootAssemblyDefinitions;
 
     @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
     public Exports(@NonNull List<? extends M> importedModules) {
@@ -196,19 +207,19 @@ public Exports(@NonNull List<? extends M> importedModules) {
       // Build the maps. Definitions from this module will take priority, with
       // shadowing being reported when a definition from this module has the same name
       // as an imported one
-      Map<String, FL> exportedFlagDefinitions = flags.collect(
+      Map<QName, FL> exportedFlagDefinitions = flags.collect(
           CustomCollectors.toMap(
-              IFlagDefinition::getName,
+              IFlagDefinition::getDefinitionQName,
               CustomCollectors.identity(),
               AbstractModule::handleShadowedDefinitions));
-      Map<String, FI> exportedFieldDefinitions = fields.collect(
+      Map<QName, FI> exportedFieldDefinitions = fields.collect(
           CustomCollectors.toMap(
-              IFieldDefinition::getName,
+              IFieldDefinition::getDefinitionQName,
               CustomCollectors.identity(),
               AbstractModule::handleShadowedDefinitions));
-      Map<String, A> exportedAssemblyDefinitions = assemblies.collect(
+      Map<QName, A> exportedAssemblyDefinitions = assemblies.collect(
           CustomCollectors.toMap(
-              IAssemblyDefinition::getName,
+              IAssemblyDefinition::getDefinitionQName,
               CustomCollectors.identity(),
               AbstractModule::handleShadowedDefinitions));
 
@@ -221,22 +232,34 @@ public Exports(@NonNull List<? extends M> importedModules) {
       this.exportedAssemblyDefinitions = exportedAssemblyDefinitions.isEmpty()
           ? CollectionUtil.emptyMap()
           : CollectionUtil.unmodifiableMap(exportedAssemblyDefinitions);
-
+      this.exportedRootAssemblyDefinitions = exportedAssemblyDefinitions.isEmpty()
+          ? CollectionUtil.emptyMap()
+          : CollectionUtil.unmodifiableMap(ObjectUtils.notNull(exportedAssemblyDefinitions.values().stream()
+              .filter(IAssemblyDefinition::isRoot)
+              .collect(CustomCollectors.toMap(
+                  IAssemblyDefinition::getRootXmlQName,
+                  CustomCollectors.identity(),
+                  AbstractModule::handleShadowedDefinitions))));
     }
 
     @NonNull
-    public Map<String, FL> getExportedFlagDefinitionMap() {
+    public Map<QName, FL> getExportedFlagDefinitionMap() {
       return this.exportedFlagDefinitions;
     }
 
     @NonNull
-    public Map<String, FI> getExportedFieldDefinitionMap() {
+    public Map<QName, FI> getExportedFieldDefinitionMap() {
       return this.exportedFieldDefinitions;
     }
 
     @NonNull
-    public Map<String, A> getExportedAssemblyDefinitionMap() {
+    public Map<QName, A> getExportedAssemblyDefinitionMap() {
       return this.exportedAssemblyDefinitions;
     }
+
+    @NonNull
+    public Map<QName, A> getExportedRootAssemblyDefinitionMap() {
+      return this.exportedRootAssemblyDefinitions;
+    }
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModuleLoader.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModuleLoader.java
index a89cf7c50..d3685383b 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModuleLoader.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractModuleLoader.java
@@ -98,7 +98,7 @@ protected List<IModuleLoader.IModulePostProcessor> getModulePostProcessors() {
   protected abstract M newModule(
       @NonNull URI resource,
       @NonNull T binding,
-      @NonNull List<M> importedModules) throws MetaschemaException;
+      @NonNull List<? extends M> importedModules) throws MetaschemaException;
 
   /**
    * Get the list of Metaschema module URIs associated with the provided binding.
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingContainerFlag.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedInstance.java
similarity index 62%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingContainerFlag.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedInstance.java
index 4fb0cd328..622a458e3 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingContainerFlag.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedInstance.java
@@ -24,38 +24,48 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
+package gov.nist.secauto.metaschema.core.model;
 
-import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerFlag;
+import gov.nist.secauto.metaschema.core.model.AbstractGlobalDefinition.NameInitializer;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceFlag;
 
-import java.util.Collection;
+import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
+import nl.talsmasoftware.lazy4j.Lazy;
 
-/**
- * Represents a definition that may contain flags.
- */
-public interface IFeatureBindingContainerFlag
-    extends IFeatureContainerFlag<IBindingInstanceFlag>, IBindingDefinitionModel {
-
-  @Override
+public abstract class AbstractNamedInstance<
+    PARENT extends IContainer>
+    extends AbstractInstance<PARENT>
+    implements INamedInstance {
+  @NonNull
+  private final Lazy<QName> qname;
   @NonNull
-  IContainerFlagSupport<IBindingInstanceFlag> getFlagContainer();
+  private final Lazy<QName> definitionQName;
 
+  /**
+   * Construct a new instance.
+   *
+   * @param parent
+   *          the parent containing the instance
+   * @param initializer
+   *          used to generate the instance qualified name
+   */
+  protected AbstractNamedInstance(@NonNull PARENT parent, @NonNull NameInitializer initializer) {
+    super(parent);
+    this.qname = ObjectUtils.notNull(Lazy.lazy(() -> initializer.apply(getEffectiveName())));
+    this.definitionQName = ObjectUtils.notNull(Lazy.lazy(() -> initializer.apply(getName())));
+  }
+
+  @SuppressWarnings("null")
   @Override
-  @Nullable
-  default IBindingInstanceFlag getFlagInstanceByName(String name) {
-    return getFlagContainer().getFlagInstanceMap().get(name);
+  public final QName getXmlQName() {
+    return qname.get();
   }
 
+  @SuppressWarnings("null")
   @Override
-  @NonNull
-  default Collection<IBindingInstanceFlag> getFlagInstances() {
-    return ObjectUtils.notNull(getFlagContainer().getFlagInstanceMap().values());
+  public final QName getReferencedDefinitionQName() {
+    return definitionQName.get();
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedModelInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedModelInstance.java
new file mode 100644
index 000000000..d01a0f2ff
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedModelInstance.java
@@ -0,0 +1,65 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * A base class for name members of a containing model.
+ *
+ * @param <PARENT>
+ *          the Java type of the parent model container for this instance
+ * @param <PARENT_DEFINITION>
+ *          the Java type of the containing assembly definition
+ */
+public abstract class AbstractNamedModelInstance<
+    PARENT extends IContainerModel,
+    PARENT_DEFINITION extends IAssemblyDefinition>
+    extends AbstractNamedInstance<PARENT>
+    implements INamedModelInstance {
+
+  /**
+   * Construct a new instance.
+   *
+   * @param parent
+   *          the parent containing the instance
+   */
+  protected AbstractNamedModelInstance(@NonNull PARENT parent) {
+    super(parent, name -> parent.getOwningDefinition().getContainingModule().toModelQName(name));
+  }
+
+  @Override
+  public final PARENT_DEFINITION getContainingDefinition() {
+    // TODO: look for ways to avoid this cast. The problem is that IContainerModel
+    // is not easily generalized, since this interface is extended by core model
+    // interfaces. Perhaps moving default implementation into abstract or concrete
+    // implementation is a possible path?
+    return ObjectUtils.asType(getParentContainer().getOwningDefinition());
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/FlagContainerBuilder.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/FlagContainerBuilder.java
new file mode 100644
index 000000000..b979385af
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/FlagContainerBuilder.java
@@ -0,0 +1,110 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+import gov.nist.secauto.metaschema.core.model.impl.DefaultContainerFlagSupport;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.CustomCollectors;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+public class FlagContainerBuilder<T extends IFlagInstance> implements IFlagContainerBuilder<T> {
+  private static final Logger LOGGER = LogManager.getLogger(FlagContainerBuilder.class);
+
+  @Nullable
+  private final QName jsonKeyName;
+  @NonNull
+  private final List<T> flags;
+
+  /**
+   * Construct a new flag container using the provided flag qualified name as the
+   * JSON key.
+   *
+   * @param jsonKeyName
+   *          the qualified name of the JSON key or {@code null} if no JSON key is
+   *          configured
+   */
+  public FlagContainerBuilder(@Nullable QName jsonKeyName) {
+    this.jsonKeyName = jsonKeyName;
+    this.flags = new LinkedList<>();
+  }
+
+  @Override
+  @NonNull
+  public IFlagContainerBuilder<T> flag(@NonNull T instance) {
+    flags.add(instance);
+    return this;
+  }
+
+  @Override
+  public IContainerFlagSupport<T> build() {
+    IContainerFlagSupport<T> retval;
+    if (flags.isEmpty()) {
+      retval = IContainerFlagSupport.empty();
+    } else {
+      Map<QName, T> flagMap = CollectionUtil.unmodifiableMap(ObjectUtils.notNull(flags.stream()
+          .collect(
+              CustomCollectors.toMap(
+                  INamed::getXmlQName,
+                  CustomCollectors.identity(),
+                  FlagContainerBuilder::handleShadowedInstances,
+                  LinkedHashMap::new))));
+
+      T jsonKey = jsonKeyName == null ? null : flagMap.get(jsonKeyName);
+      retval = new DefaultContainerFlagSupport<>(flagMap, jsonKey);
+    }
+    return retval;
+  }
+
+  private static <INSTANCE extends IFlagInstance> INSTANCE handleShadowedInstances(
+      @NonNull QName key,
+      @NonNull INSTANCE shadowed,
+      @NonNull INSTANCE shadowing) {
+    if (!shadowed.equals(shadowing) && LOGGER.isErrorEnabled()) {
+      IModelDefinition owningDefinition = shadowing.getContainingDefinition();
+      IModule module = owningDefinition.getContainingModule();
+      LOGGER.error("Unexpected duplicate flag instance named '%s' in definition '%s' in module name '%s' at '%s'",
+          key,
+          owningDefinition.getDefinitionQName(),
+          module.getShortName(),
+          module.getLocation());
+    }
+    return shadowing;
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssembly.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssembly.java
index f40f5c2de..774cc1ba8 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssembly.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssembly.java
@@ -32,7 +32,7 @@
  * A marker interface for an information element that is an assembly model type.
  *
  */
-public interface IAssembly extends IModelElement, INamed, IAttributable {
+public interface IAssembly extends INamedModelElement, IAttributable {
   /**
    * Provides the Metaschema model type of "ASSEMBLY".
    *
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyDefinition.java
index a6297b133..a204152cf 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyDefinition.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
+import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
 import gov.nist.secauto.metaschema.core.model.constraint.IFeatureModelConstrained;
 
 import javax.xml.namespace.QName;
@@ -34,6 +35,7 @@
 
 public interface IAssemblyDefinition
     extends IModelDefinition, IContainerModelAssembly, IAssembly, IFeatureModelConstrained {
+  QName MODEL_QNAME = new QName(IModule.XML_NAMESPACE, "model");
 
   /**
    * Check if the assembly is a top-level root assembly.
@@ -81,7 +83,7 @@ default QName getRootXmlQName() {
     QName retval = null;
     String rootName = getRootName();
     if (rootName != null) {
-      retval = new QName(getContainingModule().getXmlNamespace().toASCIIString(), rootName);
+      retval = getContainingModule().toModelQName(rootName);
     }
     return retval;
   }
@@ -107,6 +109,11 @@ default IAssemblyDefinition getOwningDefinition() {
     return this;
   }
 
+  @Override
+  default IAssemblyNodeItem getNodeItem() {
+    return null;
+  }
+
   @Override
   default boolean hasChildren() {
     return IModelDefinition.super.hasChildren() || IContainerModelAssembly.super.hasChildren();
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstance.java
index fe149b15c..6bc6ac7fa 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IAssemblyInstance.java
@@ -26,23 +26,11 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import javax.xml.namespace.QName;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 public interface IAssemblyInstance extends IAssembly, INamedModelInstance {
 
   @Override
   IAssemblyDefinition getDefinition();
 
-  @Override
-  @NonNull
-  default QName getXmlQName() {
-    return ObjectUtils.notNull(INamedModelInstance.super.getXmlQName());
-  }
-
   @Override
   default boolean isEffectiveValueWrappedInXml() {
     // assembly instances are always wrapped
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundContainerFlag.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IBoundObject.java
similarity index 78%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundContainerFlag.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/IBoundObject.java
index 8a63584b6..ae6bbb61b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundContainerFlag.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IBoundObject.java
@@ -24,19 +24,21 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model;
+package gov.nist.secauto.metaschema.core.model;
 
-import gov.nist.secauto.metaschema.core.model.IContainerFlag;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
-import java.util.Collection;
-
-public interface IBoundContainerFlag extends IContainerFlag {
-  @Override
-  IBoundInstanceFlag getFlagInstanceByName(String name);
-
-  @Override
-  Collection<? extends IBoundInstanceFlag> getFlagInstances();
-  //
-  // @Override
-  // IBoundInstanceFlag getJsonKeyFlagInstance();
+/**
+ * A common interface found bound objects that have a complex model consisting
+ * of flags, fields, or assemblies.
+ */
+public interface IBoundObject {
+  /**
+   * Get additional Metaschema-related information for the object (i.e., resource
+   * location).
+   *
+   * @return the Metaschema-related information
+   */
+  @Nullable
+  IMetaschemaData getMetaschemaData();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IChoiceGroupInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IChoiceGroupInstance.java
index 727e000f9..4a43cea19 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IChoiceGroupInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IChoiceGroupInstance.java
@@ -31,6 +31,7 @@
 import java.util.Locale;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 public interface IChoiceGroupInstance
     extends IModelInstanceAbsolute, IContainerModelGrouped {
@@ -84,6 +85,18 @@ default boolean isEffectiveValueWrappedInXml() {
     return true;
   }
 
+  /**
+   * Get the effective name of the JSON key flag, if a JSON key is configured.
+   * <p>
+   * This name is expected to be in the same namespace as the containing model
+   * element (i.e. choice group, assembly, field).
+   *
+   * @return the name of the JSON key flag if configured, or {@code null}
+   *         otherwise
+   */
+  @Nullable
+  String getJsonKeyFlagInstanceName();
+
   /**
    * Get the named model instance for the provided choice group item.
    *
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerFlagSupport.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerFlagSupport.java
index dc005314d..95b81fa97 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerFlagSupport.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerFlagSupport.java
@@ -26,16 +26,21 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
+import gov.nist.secauto.metaschema.core.model.impl.EmptyFlagContainer;
+
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 public interface IContainerFlagSupport<FI extends IFlagInstance> {
   /**
    * Provides an empty instance.
    *
    * @param <T>
-   *          the Java type of the flag instance
+   *          the Java type of the flag instances
    * @return an empty instance
    */
   @SuppressWarnings("unchecked")
@@ -44,13 +49,46 @@ static <T extends IFlagInstance> IContainerFlagSupport<T> empty() {
     return (IContainerFlagSupport<T>) EmptyFlagContainer.EMPTY;
   }
 
+  /**
+   * Create a new flag container without a JSON key.
+   *
+   * @param <T>
+   *          the Java type of the flag instances
+   * @return the flag container
+   */
+  @NonNull
+  static <T extends IFlagInstance> IFlagContainerBuilder<T> builder() {
+    return new FlagContainerBuilder<>(null);
+  }
+
+  /**
+   * Create a new flag container using the provided flag qualified name as the
+   * JSON key.
+   *
+   * @param <T>
+   *          the Java type of the flag instances
+   * @param jsonKey
+   *          the qualified name of the JSON key
+   * @return the flag container
+   */
+  @NonNull
+  static <T extends IFlagInstance> IFlagContainerBuilder<T> builder(@NonNull QName jsonKey) {
+    return new FlagContainerBuilder<>(jsonKey);
+  }
+
   /**
    * Get a mapping of flag effective name to flag instance.
    *
    * @return the mapping of flag effective name to flag instance
    */
   @NonNull
-  Map<String, FI> getFlagInstanceMap();
-  // @Nullable
-  // FI getJsonKeyFlagInstance();
+  Map<QName, FI> getFlagInstanceMap();
+
+  /**
+   * Get the JSON key flag instance.
+   *
+   * @return the flag instance or {@code null} if no JSON key is configured
+   */
+  @Nullable
+  FI getJsonKeyFlagInstance();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModel.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModel.java
index 1c2795e8f..3bd7e8126 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModel.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModel.java
@@ -28,6 +28,8 @@
 
 import java.util.Collection;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -76,7 +78,7 @@ default boolean hasChildren() {
    * @see INamedModelInstance#getEffectiveName()
    */
   @Nullable
-  INamedModelInstance getNamedModelInstanceByName(String name);
+  INamedModelInstance getNamedModelInstanceByName(QName name);
 
   /**
    * Get all field instances within the container.
@@ -96,7 +98,7 @@ default boolean hasChildren() {
    * @see IFieldInstance#getUseName()
    */
   @Nullable
-  IFieldInstance getFieldInstanceByName(String name);
+  IFieldInstance getFieldInstanceByName(QName name);
 
   /**
    * Get all assembly instances within the container.
@@ -116,5 +118,5 @@ default boolean hasChildren() {
    * @see INamedModelInstance#getEffectiveName()
    */
   @Nullable
-  IAssemblyInstance getAssemblyInstanceByName(String name);
+  IAssemblyInstance getAssemblyInstanceByName(QName name);
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAbsolute.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAbsolute.java
index 9d06482f1..501aa0458 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAbsolute.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelAbsolute.java
@@ -28,6 +28,8 @@
 
 import java.util.Collection;
 
+import javax.xml.namespace.QName;
+
 public interface IContainerModelAbsolute extends IContainerModel {
 
   @Override
@@ -37,17 +39,17 @@ public interface IContainerModelAbsolute extends IContainerModel {
   Collection<? extends INamedModelInstanceAbsolute> getNamedModelInstances();
 
   @Override
-  INamedModelInstanceAbsolute getNamedModelInstanceByName(String name);
+  INamedModelInstanceAbsolute getNamedModelInstanceByName(QName name);
 
   @Override
   Collection<? extends IFieldInstanceAbsolute> getFieldInstances();
 
   @Override
-  IFieldInstanceAbsolute getFieldInstanceByName(String name);
+  IFieldInstanceAbsolute getFieldInstanceByName(QName name);
 
   @Override
   Collection<? extends IAssemblyInstanceAbsolute> getAssemblyInstances();
 
   @Override
-  IAssemblyInstanceAbsolute getAssemblyInstanceByName(String name);
+  IAssemblyInstanceAbsolute getAssemblyInstanceByName(QName name);
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelGrouped.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelGrouped.java
index 819dc7874..80033a95b 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelGrouped.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelGrouped.java
@@ -28,6 +28,8 @@
 
 import java.util.Collection;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -62,7 +64,7 @@ default Collection<? extends INamedModelInstanceGrouped> getModelInstances() {
    */
   @Override
   @Nullable
-  INamedModelInstanceGrouped getNamedModelInstanceByName(String name);
+  INamedModelInstanceGrouped getNamedModelInstanceByName(QName name);
 
   /**
    * Get all field instances within the container.
@@ -84,7 +86,7 @@ default Collection<? extends INamedModelInstanceGrouped> getModelInstances() {
    */
   @Override
   @Nullable
-  IFieldInstanceGrouped getFieldInstanceByName(String name);
+  IFieldInstanceGrouped getFieldInstanceByName(QName name);
 
   /**
    * Get all assembly instances within the container.
@@ -106,5 +108,5 @@ default Collection<? extends INamedModelInstanceGrouped> getModelInstances() {
    */
   @Override
   @Nullable
-  IAssemblyInstanceGrouped getAssemblyInstanceByName(String name);
+  IAssemblyInstanceGrouped getAssemblyInstanceByName(QName name);
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelSupport.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelSupport.java
index 892d870ce..dd4e0b844 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelSupport.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IContainerModelSupport.java
@@ -31,6 +31,8 @@
 import java.util.Collection;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -88,7 +90,7 @@ AI extends IAssemblyInstance> IContainerModelSupport<MI, NMI, FI, AI> empty() {
    * @return the mapping
    */
   @NonNull
-  Map<String, NMI> getNamedModelInstanceMap();
+  Map<QName, NMI> getNamedModelInstanceMap();
 
   /**
    * Get a mapping of all field instances, mapped from their effective name to the
@@ -97,7 +99,7 @@ AI extends IAssemblyInstance> IContainerModelSupport<MI, NMI, FI, AI> empty() {
    * @return the mapping
    */
   @NonNull
-  Map<String, FI> getFieldInstanceMap();
+  Map<QName, FI> getFieldInstanceMap();
 
   /**
    * Get a mapping of all assembly instances, mapped from their effective name to
@@ -106,5 +108,5 @@ AI extends IAssemblyInstance> IContainerModelSupport<MI, NMI, FI, AI> empty() {
    * @return the mapping
    */
   @NonNull
-  Map<String, AI> getAssemblyInstanceMap();
+  Map<QName, AI> getAssemblyInstanceMap();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDefinition.java
index 50397822d..70945d9cb 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDefinition.java
@@ -30,9 +30,12 @@
 
 import java.util.Locale;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IDefinition extends IModelElement, INamed, IAttributable, IFeatureValueConstrained {
+public interface IDefinition extends INamedModelElement, IAttributable, IFeatureValueConstrained {
 
   @NonNull
   ModuleScopeEnum DEFAULT_DEFINITION_MODEL_SCOPE = ModuleScopeEnum.INHERITED;
@@ -47,6 +50,21 @@ default ModuleScopeEnum getModuleScope() {
     return ModuleScopeEnum.LOCAL;
   }
 
+  /**
+   * The qualified name for the definition.
+   * <p>
+   * This name is the combination of the definition's namespace, which is the
+   * module's namespace, and the definition's name.
+   *
+   * @return the definition's qualified name
+   */
+  @NonNull
+  default QName getDefinitionQName() {
+    return new QName(
+        getContainingModule().getXmlNamespace().toASCIIString(),
+        getName());
+  }
+
   /**
    * Determine if the definition is defined inline, meaning the definition is
    * declared where it is used.
@@ -55,7 +73,7 @@ default ModuleScopeEnum getModuleScope() {
    *         the definition is able to be globally referenced
    */
   default boolean isInline() {
-    return false;
+    return getInlineInstance() != null;
   }
 
   /**
@@ -90,4 +108,16 @@ default String toCoordinates() {
         hashCode());
   }
 
+  /**
+   * Get the resource location information for the provided item, if known.
+   *
+   * @param itemValue
+   *          the item to get the location information for
+   *
+   * @return the resource location information, or {@code null} if not known
+   */
+  @Nullable
+  default IResourceLocation getLocation(@NonNull Object itemValue) {
+    return itemValue instanceof IBoundObject ? ((IBoundObject) itemValue).getMetaschemaData() : null;
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDescribable.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDescribable.java
index 5aed8308e..e9a2c4530 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDescribable.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IDescribable.java
@@ -48,4 +48,28 @@ public interface IDescribable {
   // from INamedModelElement
   @Nullable
   MarkupLine getDescription();
+
+  /**
+   * The resolved formal display name, which allows an instance to override a
+   * definition's name.
+   *
+   * @return the formal name or {@code null} if not defined
+   */
+  // from INamedModelElement
+  @Nullable
+  default String getEffectiveFormalName() {
+    return getFormalName();
+  }
+
+  /**
+   * Get the text that describes the basic use of the element, which allows an
+   * instance to override a definition's description.
+   *
+   * @return a line of markup text or {@code null} if not defined
+   */
+  // from INamedModelElement
+  @Nullable
+  default MarkupLine getEffectiveDescription() {
+    return getDescription();
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerFlag.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerFlag.java
index 02c7c1367..51ac31b1a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerFlag.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerFlag.java
@@ -30,6 +30,8 @@
 
 import java.util.Collection;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -39,7 +41,7 @@
  * @param <FI>
  *          the flag instance Java type
  */
-public interface IFeatureContainerFlag<FI extends IFlagInstance> extends IContainerFlag {
+public interface IFeatureContainerFlag<FI extends IFlagInstance> extends IModelDefinition {
   /**
    * Lazy initialize the flag instances associated with this definition.
    *
@@ -50,7 +52,7 @@ public interface IFeatureContainerFlag<FI extends IFlagInstance> extends IContai
 
   @Override
   @Nullable
-  default FI getFlagInstanceByName(String name) {
+  default FI getFlagInstanceByName(QName name) {
     return getFlagContainer().getFlagInstanceMap().get(name);
   }
 
@@ -59,4 +61,9 @@ default FI getFlagInstanceByName(String name) {
   default Collection<? extends FI> getFlagInstances() {
     return ObjectUtils.notNull(getFlagContainer().getFlagInstanceMap().values());
   }
+
+  @Override
+  default FI getJsonKey() {
+    return getFlagContainer().getJsonKeyFlagInstance();
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModel.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModel.java
index 7bf024b3a..c96965ea5 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModel.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModel.java
@@ -28,6 +28,8 @@
 
 import java.util.Collection;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -62,7 +64,7 @@ default Collection<MI> getModelInstances() {
   }
 
   @Override
-  default NMI getNamedModelInstanceByName(String name) {
+  default NMI getNamedModelInstanceByName(QName name) {
     return getModelContainer().getNamedModelInstanceMap().get(name);
   }
 
@@ -73,7 +75,7 @@ default Collection<NMI> getNamedModelInstances() {
   }
 
   @Override
-  default FI getFieldInstanceByName(String name) {
+  default FI getFieldInstanceByName(QName name) {
     return getModelContainer().getFieldInstanceMap().get(name);
   }
 
@@ -84,7 +86,7 @@ default Collection<FI> getFieldInstances() {
   }
 
   @Override
-  default AI getAssemblyInstanceByName(String name) {
+  default AI getAssemblyInstanceByName(QName name) {
     return getModelContainer().getAssemblyInstanceMap().get(name);
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelAbsolute.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelAbsolute.java
index 0132e5990..03d6e5cd2 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelAbsolute.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelAbsolute.java
@@ -28,6 +28,8 @@
 
 import java.util.Collection;
 
+import javax.xml.namespace.QName;
+
 /**
  * Common interface for model container support classes.
  *
@@ -44,14 +46,15 @@ public interface IFeatureContainerModelAbsolute<
     MI extends IModelInstanceAbsolute,
     NMI extends INamedModelInstanceAbsolute,
     FI extends IFieldInstanceAbsolute,
-    AI extends IAssemblyInstanceAbsolute> extends IContainerModelAbsolute, IFeatureContainerModel<MI, NMI, FI, AI> {
+    AI extends IAssemblyInstanceAbsolute>
+    extends IContainerModelAbsolute, IFeatureContainerModel<MI, NMI, FI, AI> {
   @Override
   default Collection<MI> getModelInstances() {
     return getModelContainer().getModelInstances();
   }
 
   @Override
-  default NMI getNamedModelInstanceByName(String name) {
+  default NMI getNamedModelInstanceByName(QName name) {
     return getModelContainer().getNamedModelInstanceMap().get(name);
   }
 
@@ -62,7 +65,7 @@ default Collection<NMI> getNamedModelInstances() {
   }
 
   @Override
-  default FI getFieldInstanceByName(String name) {
+  default FI getFieldInstanceByName(QName name) {
     return getModelContainer().getFieldInstanceMap().get(name);
   }
 
@@ -73,7 +76,7 @@ default Collection<FI> getFieldInstances() {
   }
 
   @Override
-  default AI getAssemblyInstanceByName(String name) {
+  default AI getAssemblyInstanceByName(QName name) {
     return getModelContainer().getAssemblyInstanceMap().get(name);
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelGrouped.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelGrouped.java
index 06604b21d..d012bdd87 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelGrouped.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureContainerModelGrouped.java
@@ -28,6 +28,8 @@
 
 import java.util.Collection;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface IFeatureContainerModelGrouped<
@@ -55,7 +57,7 @@ default Collection<NMI> getModelInstances() {
   }
 
   @Override
-  default NMI getNamedModelInstanceByName(String name) {
+  default NMI getNamedModelInstanceByName(QName name) {
     return getModelContainer().getNamedModelInstanceMap().get(name);
   }
 
@@ -66,7 +68,7 @@ default Collection<NMI> getNamedModelInstances() {
   }
 
   @Override
-  default FI getFieldInstanceByName(String name) {
+  default FI getFieldInstanceByName(QName name) {
     return getModelContainer().getFieldInstanceMap().get(name);
   }
 
@@ -77,7 +79,7 @@ default Collection<FI> getFieldInstances() {
   }
 
   @Override
-  default AI getAssemblyInstanceByName(String name) {
+  default AI getAssemblyInstanceByName(QName name) {
     return getModelContainer().getAssemblyInstanceMap().get(name);
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionInstanceInlined.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionInstanceInlined.java
index 15c748dbb..11b3f48ea 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionInstanceInlined.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionInstanceInlined.java
@@ -27,9 +27,12 @@
 package gov.nist.secauto.metaschema.core.model;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.Locale;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -42,7 +45,9 @@
  * @param <INSTANCE>
  *          the associated instance Java type
  */
-public interface IFeatureDefinitionInstanceInlined<DEFINITION extends IDefinition, INSTANCE extends INamedInstance>
+public interface IFeatureDefinitionInstanceInlined<
+    DEFINITION extends IDefinition,
+    INSTANCE extends INamedInstance>
     extends IDefinition, INamedInstance {
   @Override
   default boolean isInline() {
@@ -51,11 +56,20 @@ default boolean isInline() {
   }
 
   @Override
-  DEFINITION getDefinition();
+  default QName getDefinitionQName() {
+    return getReferencedDefinitionQName();
+  }
+
+  @Override
+  default DEFINITION getDefinition() {
+    return ObjectUtils.asType(this);
+  }
 
   @Override
   @NonNull
-  INSTANCE getInlineInstance();
+  default INSTANCE getInlineInstance() {
+    return ObjectUtils.asType(this);
+  }
 
   @Override
   default String getEffectiveFormalName() {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionReferenceInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionReferenceInstance.java
index 16e54f0ff..e4fc03b98 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionReferenceInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureDefinitionReferenceInstance.java
@@ -28,8 +28,6 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 
-import java.util.Locale;
-
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -103,32 +101,4 @@ default Object getEffectiveDefaultValue() {
     }
     return retval;
   }
-
-  /**
-   * Generates a "coordinate" string for the provided information element
-   * instance.
-   *
-   * A coordinate consists of the element's:
-   * <ul>
-   * <li>containing Metaschema module's short name</li>
-   * <li>model type</li>
-   * <li>name</li>
-   * <li>hash code</li>
-   * <li>the hash code of the referenced definition</li>
-   * </ul>
-   *
-   * @return the coordinate
-   */
-  @SuppressWarnings("null")
-  @Override
-  default String toCoordinates() {
-    IDefinition definition = getDefinition();
-    return String.format("%s-instance:%s:%s/%s@%d(%d)",
-        getModelType().toString().toLowerCase(Locale.ROOT),
-        getContainingDefinition().getContainingModule().getShortName(),
-        definition.getName(),
-        getName(),
-        hashCode(),
-        definition.hashCode());
-  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureValueless.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureValueless.java
similarity index 93%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureValueless.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureValueless.java
index cfbcae651..59f0b9527 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureValueless.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFeatureValueless.java
@@ -24,10 +24,9 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
-
-import gov.nist.secauto.metaschema.core.model.IInstanceAbsolute;
+package gov.nist.secauto.metaschema.core.model;
 
+// REFACTOR: rename to IFeatureValuelessInstance
 public interface IFeatureValueless extends IInstanceAbsolute {
   @Override
   default Object getValue(Object parent) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IField.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IField.java
index d694146a4..ade2e6bc6 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IField.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IField.java
@@ -30,7 +30,7 @@
  * A marker interface for an information element that is a field model type.
  *
  */
-public interface IField extends IModelElement, INamed, IAttributable {
+public interface IField extends INamedModelElement, IAttributable {
   /**
    * Provides the Metaschema model type of "FIELD".
    *
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstance.java
index 98879931c..9a50d38c7 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFieldInstance.java
@@ -26,24 +26,12 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
-import javax.xml.namespace.QName;
-
 public interface IFieldInstance extends IField, INamedModelInstance, IValuedInstance {
   boolean DEFAULT_FIELD_IN_XML_WRAPPED = true;
 
-  @Override
-  default String getXmlNamespace() {
-    return INamedModelInstance.super.getXmlNamespace();
-  }
-
   @Override
   IFieldDefinition getDefinition();
 
-  @Override
-  default QName getXmlQName() {
-    return isEffectiveValueWrappedInXml() ? INamedModelInstance.super.getXmlQName() : null;
-  }
-
   /**
    * Determines if the field is configured to have a wrapper in XML.
    *
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlag.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlag.java
index f227035a5..a76a352f3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlag.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlag.java
@@ -30,7 +30,7 @@
  * A marker interface for an information element that is an flag model type.
  *
  */
-public interface IFlag extends IModelElement, INamed, IAttributable {
+public interface IFlag extends INamedModelElement, IAttributable {
   /**
    * Provides the Metaschema model type of "FLAG".
    *
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractBinding.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagContainerBuilder.java
similarity index 80%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractBinding.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagContainerBuilder.java
index 2a60a5bbb..0a2f7c7e7 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractBinding.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagContainerBuilder.java
@@ -24,25 +24,26 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
-
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModelElement;
+package gov.nist.secauto.metaschema.core.model;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public abstract class AbstractBinding<BINDING> implements IBindingModelElement {
+public interface IFlagContainerBuilder<T extends IFlagInstance> {
+  /**
+   * Add a flag instance to the flag container.
+   *
+   * @param instance
+   *          the flag instance to add
+   * @return this builder
+   */
   @NonNull
-  private final BINDING binding;
-
-  protected AbstractBinding(
-      @NonNull BINDING binding) {
-    this.binding = binding;
-  }
+  IFlagContainerBuilder<T> flag(@NonNull T instance);
 
-  @Override
+  /**
+   * Build the flag container.
+   *
+   * @return the built flag container
+   */
   @NonNull
-  public BINDING getBinding() {
-    return binding;
-  }
-
+  IContainerFlagSupport<T> build();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagDefinition.java
index 7aa06994e..727a7fd69 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagDefinition.java
@@ -28,8 +28,5 @@
 
 public interface IFlagDefinition extends IValuedDefinition, IFlag {
   @Override
-  default IFlagInstance getInlineInstance() {
-    // not inline by default
-    return null;
-  }
+  IFlagInstance getInlineInstance();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagInstance.java
index 7e397d9c7..3b6038ea9 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IFlagInstance.java
@@ -26,35 +26,23 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
 import javax.xml.namespace.QName;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 public interface IFlagInstance extends IFlag, IValuedInstance, IInstanceAbsolute {
 
   boolean DEFAULT_FLAG_REQUIRED = false;
 
   @Override
-  IContainerFlag getParentContainer();
+  IModelDefinition getParentContainer();
 
   @Override
-  default String getXmlNamespace() {
-    // by default, flags do not have namespaces
-    return null;
-  }
+  IFlagDefinition getDefinition();
 
-  @NonNull
   @Override
-  default QName getXmlQName() {
-    // flags always have a qname
-    return ObjectUtils.requireNonNull(IValuedInstance.super.getXmlQName());
+  default IModelDefinition getContainingDefinition() {
+    return getParentContainer();
   }
 
-  @Override
-  IFlagDefinition getDefinition();
-
   /**
    * Determines if a flag value is required to be provided.
    *
@@ -64,4 +52,15 @@ default QName getXmlQName() {
   default boolean isRequired() {
     return DEFAULT_FLAG_REQUIRED;
   }
+
+  @Override
+  default QName getReferencedDefinitionQName() {
+    return getContainingModule().toFlagQName(getName());
+  }
+
+  @Override
+  default QName getXmlQName() {
+    // flags do not have a namespace by default
+    return getContainingModule().toFlagQName(getEffectiveName());
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IGroupable.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IGroupable.java
index 0780bf6e6..0c2b565c9 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IGroupable.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IGroupable.java
@@ -36,7 +36,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IGroupable extends IInstanceAbsolute, IKeyed {
+public interface IGroupable extends IInstance {
 
   int DEFAULT_GROUP_AS_MIN_OCCURS = 0;
   int DEFAULT_GROUP_AS_MAX_OCCURS = 1;
@@ -85,8 +85,7 @@ default String getGroupAsName() {
    */
   @Nullable
   default String getGroupAsXmlNamespace() {
-    // no group-as by default
-    return null;
+    return getContainingDefinition().getXmlNamespace();
   }
 
   /**
@@ -97,9 +96,11 @@ default String getGroupAsXmlNamespace() {
    *
    * @return the XML namespace
    */
+  // REFACTOR: remove this method
+  // REFACTOR: consider pushing down the call for getGroupAsXmlNamespace
   @NonNull
   default String getEffectiveGroupAsNamespace() {
-    String namespace = getGroupAsXmlNamespace();
+    @Nullable String namespace = getGroupAsXmlNamespace();
     if (namespace == null) {
       namespace = ObjectUtils.notNull(getContainingModule().getXmlNamespace().toASCIIString());
     }
@@ -115,6 +116,7 @@ default String getEffectiveGroupAsNamespace() {
    * @return the groupAs QName or {@code null} if no name is configured, such as
    *         when {@link #getMaxOccurs()} = 1.
    */
+  // REFACTOR: rename to getXmlGroupAsQName
   @Nullable
   default QName getEffectiveXmlGroupAsQName() {
     return XmlGroupAsBehavior.GROUPED.equals(getXmlGroupAsBehavior())
@@ -164,7 +166,7 @@ default XmlGroupAsBehavior getXmlGroupAsBehavior() {
    * @return the item values or an empty collection if no item values exist
    */
   @NonNull
-  default Collection<?> getItemValues(Object instanceValue) {
+  default Collection<?> getItemValues(@NonNull Object instanceValue) {
     // no item values by default
     return CollectionUtil.emptyList();
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IKeyed.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IJsonNamed.java
similarity index 86%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/IKeyed.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/IJsonNamed.java
index 88df9aae9..0b1ed76e2 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IKeyed.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IJsonNamed.java
@@ -26,16 +26,16 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
-public interface IKeyed {
+public interface IJsonNamed {
 
   /**
-   * Get the name of the JSON key, if a JSON key is configured.
+   * Get the name used for the associated property in JSON/YAML
+   * serialization-related operations.
    *
-   * @return the name of the JSON key flag if configured, or {@code null}
-   *         otherwise
+   * @return the JSON property name
    */
-  @Nullable
-  String getJsonKeyFlagName();
+  @NonNull
+  String getJsonName();
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceNamed.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetapathQueryable.java
similarity index 77%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceNamed.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetapathQueryable.java
index e90e5ebc6..ac8f757a8 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceNamed.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetapathQueryable.java
@@ -24,15 +24,22 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model;
+package gov.nist.secauto.metaschema.core.model;
 
-import gov.nist.secauto.metaschema.core.model.INamedInstance;
+import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 
-public interface IBoundInstanceNamed extends IBoundInstance, INamedInstance {
+import edu.umd.cs.findbugs.annotations.Nullable;
 
-  @Override
-  default String getJsonName() {
-    // needed to avoid conflict between IBoundInstance and INamedInstance
-    return INamedInstance.super.getJsonName();
+public interface IMetapathQueryable {
+  /**
+   * Get the Metapath node item for this Metaschema module construct, which can be
+   * used to query it.
+   *
+   * @return the node item if the implementation can be queried by a Metapath or
+   *         {@code null} otherwise
+   */
+  @Nullable
+  default INodeItem getNodeItem() {
+    return null;
   }
 }
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/package-info.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaData.java
similarity index 92%
rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/package-info.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaData.java
index 6cafc85cb..87ebc718f 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/package-info.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaData.java
@@ -24,4 +24,8 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.testing.model;
+package gov.nist.secauto.metaschema.core.model;
+
+public interface IMetaschemaData extends IResourceLocation {
+  // no additional methods
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaModelConstants.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaModule.java
similarity index 88%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaModelConstants.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaModule.java
index f31d762bf..8400ef50a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaModelConstants.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IMetaschemaModule.java
@@ -26,10 +26,12 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
-public final class MetaschemaModelConstants {
-  public static final String METAPATH_FUNCTION_NAMESPACE = "http://csrc.nist.gov/ns/metaschema";
-
-  private MetaschemaModelConstants() {
-    /* disable construction */
-  }
+public interface IMetaschemaModule
+    extends IModuleExtended<
+        IMetaschemaModule,
+        IModelDefinition,
+        IFlagDefinition,
+        IFieldDefinition,
+        IAssemblyDefinition> {
+  // no additional methods
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelDefinition.java
index 8f6fd06dd..2d8317dda 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelDefinition.java
@@ -26,26 +26,39 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
+import java.util.Collection;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IModelDefinition extends IDefinition, IContainerFlag {
+public interface IModelDefinition extends IDefinition, IContainer {
+  @Override
+  default boolean hasChildren() {
+    return !getFlagInstances().isEmpty();
+  }
 
   /**
-   * Indicates if a flag's value can be used as a property name in the containing
-   * object in JSON who's value will be the object containing the flag. In such
-   * cases, the flag will not appear in the object. This is only allowed if the
-   * flag is required, as determined by a {@code true} result from
-   * {@link IFlagInstance#isRequired()}. The {@link IFlagInstance} can be
-   * retrieved using {@link #getJsonKeyFlagInstance()}.
+   * Retrieves a flag instance, by the flag's effective name, that is defined on
+   * the containing definition.
    *
-   * @return {@code true} if the flag's value can be used as a property name, or
-   *         {@code false} otherwise
-   * @see #getJsonKeyFlagInstance()
+   * @param name
+   *          the flag's name
+   * @return the matching flag instance, or {@code null} if there is no flag
+   *         matching the specified name
    */
-  // TODO: remove once moved to the instance side
-  default boolean hasJsonKey() {
-    return getJsonKeyFlagInstance() != null;
-  }
+  @Nullable
+  IFlagInstance getFlagInstanceByName(@NonNull QName name);
+
+  /**
+   * Retrieves the flag instances for all flags defined on the containing
+   * definition.
+   *
+   * @return the flags
+   */
+  @NonNull
+  Collection<? extends IFlagInstance> getFlagInstances();
 
   /**
    * Retrieves the flag instance to use as as the property name for the containing
@@ -53,9 +66,9 @@ default boolean hasJsonKey() {
    *
    * @return the flag instance if a JSON key is configured, or {@code null}
    *         otherwise
-   * @see #hasJsonKey()
    */
   // TODO: remove once moved to the instance side
+  // TODO: Reconsider using toFlagName in favor of getReferencedDefinitionQName
   @Nullable
-  IFlagInstance getJsonKeyFlagInstance();
+  IFlagInstance getJsonKey();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElement.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElement.java
index b6411e27b..b4da4e52d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElement.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelElement.java
@@ -35,7 +35,7 @@
  * A marker interface for Metaschema constructs that can be members of a
  * Metaschema definition's model.
  */
-public interface IModelElement extends IDefaultable {
+public interface IModelElement extends IDefaultable, IMetapathQueryable {
 
   /**
    * Get the Metaschema model type of the information element.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstance.java
index f525d5c4b..832013059 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstance.java
@@ -30,14 +30,12 @@
  * This marker interface is used to identify a field or assembly instance that
  * is a member of an assembly's model.
  */
-public interface IModelInstance extends IInstance {
+public interface IModelInstance extends IGroupable {
   @Override
   IContainerModel getParentContainer();
 
   @Override
-  default IAssemblyDefinition getContainingDefinition() {
-    return getParentContainer().getOwningDefinition();
-  }
+  IAssemblyDefinition getContainingDefinition();
 
   /**
    * Indicate if the instance allows values without an XML element wrapper.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstanceAbsolute.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstanceAbsolute.java
index 6c6cf05bb..7774c9aa5 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstanceAbsolute.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModelInstanceAbsolute.java
@@ -26,6 +26,6 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
-public interface IModelInstanceAbsolute extends IModelInstance, IGroupable {
+public interface IModelInstanceAbsolute extends IModelInstance, IInstanceAbsolute {
   // no additional methods
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModule.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModule.java
index 4b1de5491..6f1711bfd 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModule.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModule.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
 
 import java.net.URI;
 import java.util.Collection;
@@ -38,7 +39,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IModule {
+public interface IModule extends IMetapathQueryable {
 
   String XML_NAMESPACE = "http://csrc.nist.gov/ns/oscal/metaschema/1.0";
 
@@ -104,7 +105,7 @@ public interface IModule {
    * @return the qualified name
    */
   default QName getQName() {
-    return new QName(getXmlNamespace().toString(), getShortName());
+    return new QName(getXmlNamespace().toASCIIString(), getShortName());
   }
 
   /**
@@ -144,7 +145,7 @@ default QName getQName() {
    * @return the matching assembly definition, or {@code null} if none match
    */
   @Nullable
-  IAssemblyDefinition getAssemblyDefinitionByName(@NonNull String name);
+  IAssemblyDefinition getAssemblyDefinitionByName(@NonNull QName name);
 
   /**
    * Retrieves the top-level field definitions in this Metaschema module.
@@ -164,7 +165,7 @@ default QName getQName() {
    * @return the matching field definition, or {@code null} if none match
    */
   @Nullable
-  IFieldDefinition getFieldDefinitionByName(@NonNull String name);
+  IFieldDefinition getFieldDefinitionByName(@NonNull QName name);
 
   /**
    * Retrieves the top-level assembly and field definitions in this Metaschema
@@ -194,7 +195,7 @@ default QName getQName() {
    * @return the matching flag definition, or {@code null} if none match
    */
   @Nullable
-  IFlagDefinition getFlagDefinitionByName(@NonNull String name);
+  IFlagDefinition getFlagDefinitionByName(@NonNull QName name);
 
   /**
    * Retrieves the assembly definition with a matching name from either: 1) the
@@ -207,7 +208,7 @@ default QName getQName() {
    * @return the assembly definition
    */
   @Nullable
-  IAssemblyDefinition getScopedAssemblyDefinitionByName(@NonNull String name);
+  IAssemblyDefinition getScopedAssemblyDefinitionByName(@NonNull QName name);
 
   /**
    * Retrieves the field definition with a matching name from either: 1) the
@@ -219,7 +220,7 @@ default QName getQName() {
    * @return the field definition
    */
   @Nullable
-  IFieldDefinition getScopedFieldDefinitionByName(@NonNull String name);
+  IFieldDefinition getScopedFieldDefinitionByName(@NonNull QName name);
 
   /**
    * Retrieves the flag definition with a matching name from either: 1) the
@@ -231,16 +232,7 @@ default QName getQName() {
    * @return the flag definition
    */
   @Nullable
-  IFlagDefinition getScopedFlagDefinitionByName(@NonNull String name);
-
-  /**
-   * Retrieves the top-level assembly definitions that are marked as roots from
-   * the current Metaschema module and any imported Metaschema modules.
-   *
-   * @return a listing of assembly definitions marked as root
-   */
-  @NonNull
-  Collection<? extends IAssemblyDefinition> getExportedRootAssemblyDefinitions();
+  IFlagDefinition getScopedFlagDefinitionByName(@NonNull QName name);
 
   /**
    * Retrieves the top-level assembly definitions that are marked as roots from
@@ -276,7 +268,7 @@ default QName getQName() {
    * @return the flag definition, or {@code null} if it doesn't exist.
    */
   @Nullable
-  IFlagDefinition getExportedFlagDefinitionByName(String name);
+  IFlagDefinition getExportedFlagDefinitionByName(@NonNull QName name);
 
   /**
    * Retrieve the top-level field definitions that are marked global in this
@@ -303,7 +295,7 @@ default QName getQName() {
    * @return the field definition, or {@code null} if it doesn't exist.
    */
   @Nullable
-  IFieldDefinition getExportedFieldDefinitionByName(String name);
+  IFieldDefinition getExportedFieldDefinitionByName(@NonNull QName name);
 
   /**
    * Retrieve the top-level assembly definitions that are marked global in this
@@ -323,12 +315,104 @@ default QName getQName() {
    * Retrieves the exported named assembly definition, if it exists.
    * <p>
    * For information about how assembly definitions are exported see
-   * {@link #getExportedFieldDefinitions()}.
+   * {@link #getExportedAssemblyDefinitions()}.
    *
    * @param name
    *          the definition name
    * @return the assembly definition, or {@code null} if it doesn't exist.
    */
   @Nullable
-  IAssemblyDefinition getExportedAssemblyDefinitionByName(String name);
+  IAssemblyDefinition getExportedAssemblyDefinitionByName(@NonNull QName name);
+
+  /**
+   * Retrieves the top-level assembly definitions that are marked as roots from
+   * the current Metaschema module and any imported Metaschema modules.
+   *
+   * @return a listing of assembly definitions marked as root
+   */
+  @NonNull
+  Collection<? extends IAssemblyDefinition> getExportedRootAssemblyDefinitions();
+
+  /**
+   * Retrieves the exported named root assembly definition, if it exists.
+   * <p>
+   * For information about how assembly definitions are exported see
+   * {@link #getExportedAssemblyDefinitions()}.
+   *
+   * @param name
+   *          the root name
+   * @return the assembly definition, or {@code null} if it doesn't exist.
+   */
+  @Nullable
+  IAssemblyDefinition getExportedRootAssemblyDefinitionByName(QName name);
+
+  /**
+   * Used to parse a flag name reference to produce a qualified name.
+   *
+   * @param nameRef
+   *          the name reference
+   * @return the qualified name
+   */
+  @NonNull
+  default QName toFlagQName(@NonNull String nameRef) {
+    // TODO: handle namespace prefix
+    return new QName(nameRef);
+  }
+
+  /**
+   * Used to parse a flag name reference to produce a qualified name.
+   *
+   * @param modelNamespace
+   *          the namespace to use or {@code null}
+   * @param nameRef
+   *          the name reference
+   * @return the qualified name
+   */
+  @NonNull
+  default QName toFlagQName(@Nullable String modelNamespace, @NonNull String nameRef) {
+    // TODO: handle namespace prefix
+    return modelNamespace == null
+        ? new QName(nameRef)
+        : new QName(modelNamespace, nameRef);
+  }
+
+  /**
+   * Used to parse a model name reference to produce a qualified name.
+   *
+   * @param nameRef
+   *          the name reference
+   * @return the qualified name
+   */
+  @NonNull
+  default QName toModelQName(@NonNull String nameRef) {
+    return toModelQName(null, nameRef);
+  }
+
+  /**
+   * Used to parse a flag name reference to produce a qualified name.
+   *
+   * @param modelNamespace
+   *          the namespace to use or {@code null}
+   * @param nameRef
+   *          the name reference
+   * @return the qualified name
+   */
+  @NonNull
+  default QName toModelQName(@Nullable String modelNamespace, @NonNull String nameRef) {
+    // TODO: handle namespace prefix
+    String namespace = modelNamespace == null ? getXmlNamespace().toASCIIString() : modelNamespace;
+    return new QName(namespace, nameRef);
+  }
+
+  /**
+   * If this module is supported by an underlying Metaschema module
+   * representation, this method retrieves that representation.
+   *
+   * @return the underlying document as a Metapath node item or {@code null}
+   */
+  @Override
+  @Nullable
+  default IDocumentNodeItem getNodeItem() {
+    return null;
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModuleExtended.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModuleExtended.java
index fa0afbf91..8e259c499 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModuleExtended.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IModuleExtended.java
@@ -34,6 +34,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -44,9 +46,9 @@
  * can be accessed using {@link #getImportedModules()}.
  * <p>
  * Global scoped Metaschema definitions can be accessed using
- * {@link #getScopedAssemblyDefinitionByName(String)},
- * {@link #getScopedFieldDefinitionByName(String)}, and
- * {@link #getScopedFlagDefinitionByName(String)}. These methods take into
+ * {@link #getScopedAssemblyDefinitionByName(QName)},
+ * {@link #getScopedFieldDefinitionByName(QName)}, and
+ * {@link #getScopedFlagDefinitionByName(QName)}. These methods take into
  * consideration the import order to provide the global definitions that are in
  * scope within the given Metschema module.
  * <p>
@@ -120,7 +122,7 @@ static <DEF extends IDefinition> Predicate<DEF> allRootAssemblyDefinitions() {
 
   @Override
   @Nullable
-  FL getFlagDefinitionByName(@NonNull String name);
+  FL getFlagDefinitionByName(@NonNull QName name);
 
   @Override
   @NonNull
@@ -128,7 +130,7 @@ static <DEF extends IDefinition> Predicate<DEF> allRootAssemblyDefinitions() {
 
   @Override
   @Nullable
-  A getAssemblyDefinitionByName(@NonNull String name);
+  A getAssemblyDefinitionByName(@NonNull QName name);
 
   @Override
   @NonNull
@@ -136,7 +138,7 @@ static <DEF extends IDefinition> Predicate<DEF> allRootAssemblyDefinitions() {
 
   @Override
   @Nullable
-  FI getFieldDefinitionByName(@NonNull String name);
+  FI getFieldDefinitionByName(@NonNull QName name);
 
   @Override
   @SuppressWarnings("unchecked")
@@ -151,7 +153,7 @@ default List<D> getAssemblyAndFieldDefinitions() {
 
   @Override
   @Nullable
-  default A getScopedAssemblyDefinitionByName(@NonNull String name) {
+  default A getScopedAssemblyDefinitionByName(@NonNull QName name) {
     // first try local/global top-level definitions from current metaschema module
     A retval = getAssemblyDefinitionByName(name);
     if (retval == null) {
@@ -163,7 +165,7 @@ default A getScopedAssemblyDefinitionByName(@NonNull String name) {
 
   @Override
   @Nullable
-  default FI getScopedFieldDefinitionByName(@NonNull String name) {
+  default FI getScopedFieldDefinitionByName(@NonNull QName name) {
     // first try local/global top-level definitions from current metaschema module
     FI retval = getFieldDefinitionByName(name);
     if (retval == null) {
@@ -175,7 +177,7 @@ default FI getScopedFieldDefinitionByName(@NonNull String name) {
 
   @Override
   @Nullable
-  default FL getScopedFlagDefinitionByName(@NonNull String name) {
+  default FL getScopedFlagDefinitionByName(@NonNull QName name) {
     // first try local/global top-level definitions from current metaschema module
     FL retval = getFlagDefinitionByName(name);
     if (retval == null) {
@@ -207,7 +209,7 @@ default Collection<? extends A> getRootAssemblyDefinitions() {
 
   @Override
   @Nullable
-  FL getExportedFlagDefinitionByName(String name);
+  FL getExportedFlagDefinitionByName(QName name);
 
   @Override
   @NonNull
@@ -215,7 +217,7 @@ default Collection<? extends A> getRootAssemblyDefinitions() {
 
   @Override
   @Nullable
-  FI getExportedFieldDefinitionByName(String name);
+  FI getExportedFieldDefinitionByName(QName name);
 
   @Override
   @NonNull
@@ -223,5 +225,5 @@ default Collection<? extends A> getRootAssemblyDefinitions() {
 
   @Override
   @Nullable
-  A getExportedAssemblyDefinitionByName(String name);
+  A getExportedAssemblyDefinitionByName(QName name);
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamed.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamed.java
index 78192f587..33b3eb8a7 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamed.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamed.java
@@ -26,61 +26,19 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
-import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-/**
- * A marker interface for Metaschema constructs that can be members of a
- * Metaschema module's model that have a name and other identifying
- * characteristics.
- */
-public interface INamed extends IDescribable {
-  /**
-   * The resolved formal display name, which allows an instance to override a
-   * definition's name.
-   *
-   * @return the formal name or {@code null} if not defined
-   */
-  // from INamedModelElement
-  @Nullable
-  default String getEffectiveFormalName() {
-    return getFormalName();
-  }
-
-  /**
-   * Get the text that describes the basic use of the element, which allows an
-   * instance to override a definition's description.
-   *
-   * @return a line of markup text or {@code null} if not defined
-   */
-  // from INamedModelElement
-  @Nullable
-  default MarkupLine getEffectiveDescription() {
-    return getDescription();
-  }
-
-  // @NonNull
-  // default QName getXmlQName() {
-  // String namespace = getXmlNamespace();
-  //
-  // @NonNull
-  // QName retval;
-  // if (namespace != null) {
-  // retval = new QName(namespace, getEffectiveName());
-  // } else {
-  // retval = new QName(getEffectiveName());
-  // }
-  // return retval;
-  // }
+public interface INamed {
 
   /**
    * Retrieve the name of the model element.
    *
    * @return the name
    */
-  // from INamedModelElement
   @NonNull
   String getName();
 
@@ -115,6 +73,43 @@ default String getEffectiveName() {
     return useName == null ? getName() : useName;
   }
 
+  /**
+   * Retrieve the XML namespace for this instance.
+   * <p>
+   * Multiple calls to this method are expected to produce the same, deterministic
+   * return value.
+   *
+   * @return the XML namespace or {@code null} if no namespace is defined
+   */
+  @Nullable
+  default String getXmlNamespace() {
+    return getXmlQName().getNamespaceURI();
+  }
+
+  /**
+   * Get the unique XML qualified name for this model element.
+   * <p>
+   * The qualified name is considered to be unique relative to all sibling
+   * elements. For a flag, this name will be unique among all flag instances on
+   * the same field or assembly definition. For a field or assembly, this name
+   * will be unique among all sibling field or assembly instances on the same
+   * assembly definition.
+   * <p>
+   * Multiple calls to this method are expected to produce the same, deterministic
+   * return value.
+   * <p>
+   * If {@link #getXmlNamespace()} is {@code null}, the the resulting QName will
+   * have the namespace {@link XMLConstants#NULL_NS_URI}.
+   * <p>
+   * This implementation may be overridden by implementation that cache the QName
+   * or provide for a more efficient method for QName creation.
+   *
+   * @return the XML qualified name, or {@code null} if there isn't one
+   */
+  // REFACTOR: rename to getQName
+  @NonNull
+  QName getXmlQName();
+
   /**
    * Retrieve the index value to use for binary naming.
    *
@@ -155,15 +150,4 @@ default Integer getEffectiveIndex() {
     @Nullable Integer useIndex = getUseIndex();
     return useIndex == null ? getIndex() : useIndex;
   }
-
-  /**
-   * Get the name used for the associated property in JSON/YAML.
-   *
-   * @return the JSON property name
-   */
-  // from INamedModelElement
-  @NonNull
-  default String getJsonName() {
-    return getEffectiveName();
-  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedInstance.java
index f9e72947e..bb695f1fa 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedInstance.java
@@ -36,7 +36,7 @@
  * identify the data.
  *
  */
-public interface INamedInstance extends INamed, IAttributable, IInstance {
+public interface INamedInstance extends INamedModelElement, IAttributable, IInstance {
   /**
    * Retrieve the definition of this instance.
    *
@@ -46,20 +46,11 @@ public interface INamedInstance extends INamed, IAttributable, IInstance {
   IDefinition getDefinition();
 
   /**
-   * Get the XML qualified name to use in XML.
+   * This represents the qualified name of a referenced definition.
    *
-   * @return the XML qualified name, or {@code null} if there isn't one
+   * @return the qualified name
+   * @see IDefinition#getDefinitionQName()
    */
-  default QName getXmlQName() {
-    return new QName(getXmlNamespace(), getEffectiveName());
-  }
-
-  /**
-   * Retrieve the XML namespace for this instance.
-   *
-   * @return the XML namespace or {@code null} if no namespace is defined
-   */
-  default String getXmlNamespace() {
-    return getContainingModule().getXmlNamespace().toASCIIString();
-  }
+  @NonNull
+  QName getReferencedDefinitionQName();
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelElement.java
similarity index 82%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstance.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelElement.java
index 0c626c4eb..3871afb15 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelElement.java
@@ -24,19 +24,19 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IInstance;
+package gov.nist.secauto.metaschema.core.model;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public interface IBindingInstance extends IInstance, IBindingModelElement {
+/**
+ * A marker interface for Metaschema constructs that can be members of a
+ * Metaschema module's model that have a name and other identifying
+ * characteristics.
+ */
+public interface INamedModelElement extends IDescribable, IModelElement, IJsonNamed, INamed {
   @Override
   @NonNull
-  IBindingDefinitionModel getContainingDefinition();
-
-  @Override
-  default IBindingModule getContainingModule() {
-    return getContainingDefinition().getContainingModule();
+  default String getJsonName() {
+    return getEffectiveName();
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstance.java
index b87337a72..47c14c813 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstance.java
@@ -26,10 +26,57 @@
 
 package gov.nist.secauto.metaschema.core.model;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface INamedModelInstance extends IModelInstance, INamedInstance, IKeyed {
+public interface INamedModelInstance extends IModelInstance, INamedInstance {
   @Override
   @NonNull
   IModelDefinition getDefinition();
+
+  /**
+   * Indicates if a flag's value can be used as a property name in the containing
+   * object in JSON who's value will be the object containing the flag. In such
+   * cases, the flag will not appear in the object. This is only allowed if the
+   * flag is required, as determined by a {@code true} result from
+   * {@link IFlagInstance#isRequired()}. The {@link IFlagInstance} can be
+   * retrieved using {@link #getEffectiveJsonKey()}.
+   *
+   * @return {@code true} if the flag's value can be used as a property name, or
+   *         {@code false} otherwise
+   * @see #getEffectiveJsonKey()
+   */
+  // TODO: remove once moved to the instance side
+  default boolean hasJsonKey() {
+    return getEffectiveJsonKey() != null;
+  }
+
+  /**
+   * Get the JSON key flag instance for this model instance, if one is configured.
+   *
+   * @return the JSON key flag instance or {@code null} if a JSON key is
+   *         configured
+   */
+  @Nullable
+  IFlagInstance getEffectiveJsonKey();
+
+  /**
+   * Get the JSON key associated with this instance.
+   *
+   * @return the configured JSON key or {@code null} if no JSON key is configured
+   */
+  @Nullable
+  IFlagInstance getJsonKey();
+
+  @Override
+  default QName getReferencedDefinitionQName() {
+    return getContainingModule().toModelQName(getName());
+  }
+
+  @Override
+  default QName getXmlQName() {
+    return getContainingModule().toModelQName(getEffectiveName());
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceAbsolute.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceAbsolute.java
index a80241dae..4e6a6b6cb 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceAbsolute.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceAbsolute.java
@@ -29,6 +29,7 @@
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 public interface INamedModelInstanceAbsolute extends INamedModelInstance, IModelInstanceAbsolute {
   @Override
@@ -48,14 +49,16 @@ default String getJsonName() {
   }
 
   @Override
-  default String getJsonKeyFlagName() {
-    String retval = null;
-    if (JsonGroupAsBehavior.KEYED.equals(getJsonGroupAsBehavior())) {
-      IFlagInstance jsonKeyFlag = getDefinition().getJsonKeyFlagInstance();
-      if (jsonKeyFlag != null) {
-        retval = jsonKeyFlag.getEffectiveName();
-      }
-    }
-    return retval;
+  @Nullable
+  default IFlagInstance getEffectiveJsonKey() {
+    return JsonGroupAsBehavior.KEYED.equals(getJsonGroupAsBehavior())
+        ? getJsonKey()
+        : null;
+  }
+
+  @Override
+  @Nullable
+  default IFlagInstance getJsonKey() {
+    return getDefinition().getJsonKey();
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceGrouped.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceGrouped.java
index 9b4f06699..e47a40932 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceGrouped.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/INamedModelInstanceGrouped.java
@@ -69,10 +69,30 @@ default String getEffectiveDisciminatorValue() {
   }
 
   @Override
-  default String getJsonKeyFlagName() {
-    IChoiceGroupInstance choiceGroup = getParentContainer();
-    return JsonGroupAsBehavior.KEYED.equals(choiceGroup.getJsonGroupAsBehavior())
-        ? ObjectUtils.notNull(choiceGroup.getJsonKeyFlagName())
+  @Nullable
+  default IFlagInstance getEffectiveJsonKey() {
+    return JsonGroupAsBehavior.KEYED.equals(getParentContainer().getJsonGroupAsBehavior())
+        ? ObjectUtils.requireNonNull(getJsonKey())
         : null;
   }
+
+  @Override
+  @Nullable
+  default IFlagInstance getJsonKey() {
+    String name = getParentContainer().getJsonKeyFlagInstanceName();
+    return name == null
+        ? null
+        : ObjectUtils.requireNonNull(getDefinition().getFlagInstanceByName(getContainingModule().toFlagQName(name)));
+  }
+
+  @Override
+  default int getMinOccurs() {
+    return getParentContainer().getMinOccurs();
+  }
+
+  @Override
+  default int getMaxOccurs() {
+    return getParentContainer().getMaxOccurs();
+  }
+
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IResourceLocation.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IResourceLocation.java
new file mode 100644
index 000000000..1cf2987eb
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IResourceLocation.java
@@ -0,0 +1,60 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+/**
+ * Represents a location within a resource.
+ */
+public interface IResourceLocation {
+  /**
+   * Get the line for a location within a resource.
+   *
+   * @return the line number or {@code -1} if unknown
+   */
+  int getLine();
+
+  /**
+   * Get the line column for a location within a resource.
+   *
+   * @return the column number or {@code -1} if unknown
+   */
+  int getColumn();
+
+  /**
+   * Get the zero-based character offset for a location within a resource.
+   *
+   * @return the character offset or {@code -1} if unknown
+   */
+  long getCharOffset();
+
+  /**
+   * Get the zero-based byte offset for a location within a resource.
+   *
+   * @return the byte offset or {@code -1} if unknown
+   */
+  long getByteOffset();
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IValued.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IValued.java
index a86258466..643f7e582 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/IValued.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/IValued.java
@@ -45,5 +45,7 @@ public interface IValued extends IDefaultable {
    */
   // from IInstanceAbsolute
   @Nullable
-  Object getValue(@NonNull Object parent);
+  default Object getValue(@NonNull Object parent) {
+    return getResolvedDefaultValue();
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/JsonGroupAsBehavior.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/JsonGroupAsBehavior.java
index 4b25ae850..1e8f86088 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/JsonGroupAsBehavior.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/JsonGroupAsBehavior.java
@@ -1,52 +1,52 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.model;
-
-public enum JsonGroupAsBehavior {
-  /**
-   * In JSON, the group of instances will be represented as a JSON object, with
-   * each instance's JSON key used as the property and the remaining data
-   * represented as a child object of that property.
-   */
-  KEYED,
-  /**
-   * In JSON, the group of instances will be represented as a single JSON object
-   * if there is one, or as an array of JSON objects if there is more than one. An
-   * empty array will be used when no items exist in the group.
-   */
-  SINGLETON_OR_LIST,
-  /**
-   * In JSON, the group of instances will be represented as an array of JSON
-   * objects if there is more than one. An empty array will be used when no items
-   * exist in the group.
-   */
-  LIST,
-  /**
-   * In JSON, the group of instances will be represented as a single JSON object.
-   */
-  NONE
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+public enum JsonGroupAsBehavior {
+  /**
+   * In JSON, the group of instances will be represented as a JSON object, with
+   * each instance's JSON key used as the property and the remaining data
+   * represented as a child object of that property.
+   */
+  KEYED,
+  /**
+   * In JSON, the group of instances will be represented as a single JSON object
+   * if there is one, or as an array of JSON objects if there is more than one. An
+   * empty array will be used when no items exist in the group.
+   */
+  SINGLETON_OR_LIST,
+  /**
+   * In JSON, the group of instances will be represented as an array of JSON
+   * objects if there is more than one. An empty array will be used when no items
+   * exist in the group.
+   */
+  LIST,
+  /**
+   * In JSON, the group of instances will be represented as a single JSON object.
+   */
+  NONE
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaException.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaException.java
index e811bf671..2f84ed780 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaException.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/MetaschemaException.java
@@ -1,88 +1,88 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.model;
-
-public class MetaschemaException
-    extends Exception {
-
-  /**
-   * The serial version UID.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * Create a new Metaschema exception with a provided message.
-   *
-   * @param message
-   *          text describing the cause of the exception
-   */
-  public MetaschemaException(String message) {
-    super(message);
-  }
-
-  /**
-   * Create a new Metaschema exception based on the provided cause.
-   *
-   * @param cause
-   *          the exception that caused this exception
-   */
-  public MetaschemaException(Throwable cause) {
-    super(cause);
-  }
-
-  /**
-   * Create a new Metaschema exception with a provided message based on the
-   * provided cause.
-   *
-   * @param message
-   *          text describing the cause of the exception
-   * @param cause
-   *          the exception that caused this exception
-   */
-  public MetaschemaException(String message, Throwable cause) {
-    super(message, cause);
-  }
-
-  /**
-   * Create a new Metaschema exception with a provided message based on the
-   * provided cause.
-   *
-   *
-   * @param message
-   *          text describing the cause of the exception
-   * @param cause
-   *          the exception that caused this exception
-   * @param enableSuppression
-   *          whether or not suppression is enabled or disabled
-   * @param writableStackTrace
-   *          whether or not the stack trace should be writable
-   */
-  public MetaschemaException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-    super(message, cause, enableSuppression, writableStackTrace);
-  }
-
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+public class MetaschemaException
+    extends Exception {
+
+  /**
+   * The serial version UID.
+   */
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * Create a new Metaschema exception with a provided message.
+   *
+   * @param message
+   *          text describing the cause of the exception
+   */
+  public MetaschemaException(String message) {
+    super(message);
+  }
+
+  /**
+   * Create a new Metaschema exception based on the provided cause.
+   *
+   * @param cause
+   *          the exception that caused this exception
+   */
+  public MetaschemaException(Throwable cause) {
+    super(cause);
+  }
+
+  /**
+   * Create a new Metaschema exception with a provided message based on the
+   * provided cause.
+   *
+   * @param message
+   *          text describing the cause of the exception
+   * @param cause
+   *          the exception that caused this exception
+   */
+  public MetaschemaException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  /**
+   * Create a new Metaschema exception with a provided message based on the
+   * provided cause.
+   *
+   *
+   * @param message
+   *          text describing the cause of the exception
+   * @param cause
+   *          the exception that caused this exception
+   * @param enableSuppression
+   *          whether or not suppression is enabled or disabled
+   * @param writableStackTrace
+   *          whether or not the stack trace should be writable
+   */
+  public MetaschemaException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+    super(message, cause, enableSuppression, writableStackTrace);
+  }
+
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/XmlGroupAsBehavior.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/XmlGroupAsBehavior.java
index 2a72b15db..3f5634f1c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/XmlGroupAsBehavior.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/XmlGroupAsBehavior.java
@@ -1,38 +1,38 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.model;
-
-public enum XmlGroupAsBehavior {
-  /**
-   * In XML, child element instances will be wrapped by a grouping element.
-   */
-  GROUPED,
-  /**
-   * In XML, child element instances will exist in an unwrapped form.
-   */
-  UNGROUPED
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model;
+
+public enum XmlGroupAsBehavior {
+  /**
+   * In XML, child element instances will be wrapped by a grouping element.
+   */
+  GROUPED,
+  /**
+   * In XML, child element instances will exist in an unwrapped form.
+   */
+  UNGROUPED
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintBuilder.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintBuilder.java
index be4008c86..95c311acc 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintBuilder.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintBuilder.java
@@ -28,7 +28,6 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
@@ -52,7 +51,7 @@ public abstract class AbstractConstraintBuilder<
   @NonNull
   private Level level = IConstraint.DEFAULT_LEVEL;
   @NonNull
-  private MetapathExpression target = IConstraint.DEFAULT_TARGET;
+  private String target = IConstraint.DEFAULT_TARGET_METAPATH;
   @NonNull
   private Map<IAttributable.Key, Set<String>> properties = new LinkedHashMap<>(); // NOPMD not thread safe
   private MarkupMultiline remarks;
@@ -141,7 +140,7 @@ public T level(@NonNull Level level) {
    * @return this builder
    */
   @NonNull
-  public T target(@NonNull MetapathExpression target) {
+  public T target(@NonNull String target) {
     this.target = target;
     return getThis();
   }
@@ -291,7 +290,7 @@ protected Level getLevel() {
    * @return the target Metapath expression
    */
   @NonNull
-  protected MetapathExpression getTarget() {
+  protected String getTarget() {
     return target;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java
index f10eb99e1..d242e2301 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java
@@ -36,6 +36,7 @@
 
 import java.util.List;
 import java.util.Objects;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -103,7 +104,7 @@ protected String newCardinalityMinimumViolationMessage(
         "The cardinality '%d' is below the required minimum '%d' for items matching '%s'.",
         targets.size(),
         constraint.getMinOccurs(),
-        constraint.getTarget().getPath());
+        constraint.getTarget());
   }
 
   /**
@@ -203,6 +204,8 @@ protected String newUniqueKeyViolationMessage(
    *          the target matching the constraint
    * @param value
    *          the target's value
+   * @param pattern
+   *          the expected pattern
    * @return the new message
    */
   @SuppressWarnings("null")
@@ -211,10 +214,11 @@ protected String newMatchPatternViolationMessage(
       @NonNull IMatchesConstraint constraint,
       @NonNull INodeItem node,
       @NonNull INodeItem target,
-      @NonNull String value) {
+      @NonNull String value,
+      @NonNull Pattern pattern) {
     return String.format("Value '%s' did not match the pattern '%s' at path '%s'",
         value,
-        constraint.getPattern().pattern(),
+        pattern.pattern(),
         toPath(target));
   }
 
@@ -230,6 +234,8 @@ protected String newMatchPatternViolationMessage(
    *          the target matching the constraint
    * @param value
    *          the target's value
+   * @param adapter
+   *          the expected data type adapter
    * @return the new message
    */
   @SuppressWarnings("null")
@@ -238,8 +244,8 @@ protected String newMatchDatatypeViolationMessage(
       @NonNull IMatchesConstraint constraint,
       @NonNull INodeItem node,
       @NonNull INodeItem target,
-      @NonNull String value) {
-    IDataTypeAdapter<?> adapter = constraint.getDataType();
+      @NonNull String value,
+      @NonNull IDataTypeAdapter<?> adapter) {
     return String.format("Value '%s' did not conform to the data type '%s' at path '%s'", value,
         adapter.getPreferredName(), toPath(target));
   }
@@ -261,17 +267,17 @@ protected String newMatchDatatypeViolationMessage(
    */
   @SuppressWarnings("null")
   @NonNull
-  protected CharSequence newExpectViolationMessage(
+  protected String newExpectViolationMessage(
       @NonNull IExpectConstraint constraint,
       @SuppressWarnings("unused") @NonNull INodeItem node,
       @NonNull INodeItem target,
       @NonNull DynamicContext dynamicContext) {
-    CharSequence message;
+    String message;
     if (constraint.getMessage() != null) {
       message = constraint.generateMessage(target, dynamicContext);
     } else {
       message = String.format("Expect constraint '%s' did not match the data at path '%s'",
-          constraint.getTest().getPath(),
+          constraint.getTest(),
           toPath(target));
     }
     return message;
@@ -289,13 +295,13 @@ protected CharSequence newExpectViolationMessage(
    */
   @SuppressWarnings("null")
   @NonNull
-  protected CharSequence newAllowedValuesViolationMessage(
+  protected String newAllowedValuesViolationMessage(
       @NonNull List<IAllowedValuesConstraint> constraints,
       @NonNull INodeItem target) {
 
     String allowedValues = constraints.stream()
         .flatMap(constraint -> constraint.getAllowedValues().values().stream())
-        .map(allowedValue -> allowedValue.getValue())
+        .map(IAllowedValue::getValue)
         .sorted()
         .distinct()
         .collect(CustomCollectors.joiningWithOxfordComma("or"));
@@ -318,7 +324,7 @@ protected CharSequence newAllowedValuesViolationMessage(
    */
   @SuppressWarnings("null")
   @NonNull
-  protected CharSequence newIndexDuplicateViolationMessage(
+  protected String newIndexDuplicateViolationMessage(
       @NonNull IIndexConstraint constraint,
       @NonNull INodeItem node) {
     return String.format("Duplicate index named '%s' found at path '%s'",
@@ -342,7 +348,7 @@ protected CharSequence newIndexDuplicateViolationMessage(
    */
   @SuppressWarnings("null")
   @NonNull
-  protected CharSequence newIndexMissMessage(
+  protected String newIndexMissMessage(
       @NonNull IIndexHasKeyConstraint constraint,
       @NonNull INodeItem node,
       @NonNull INodeItem target,
@@ -372,8 +378,8 @@ protected CharSequence newIndexMissMessage(
    */
   @SuppressWarnings("null")
   @NonNull
-  protected CharSequence newGenericValidationViolationMessage(
-      @NonNull IConstraint constraint,
+  protected String newMissingIndexViolationMessage(
+      @NonNull IIndexHasKeyConstraint constraint,
       @NonNull INodeItem node,
       @NonNull INodeItem target,
       @NonNull String message) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractTargetedConstraints.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractTargetedConstraints.java
index 5f376a714..852761d12 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractTargetedConstraints.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AbstractTargetedConstraints.java
@@ -26,8 +26,6 @@
 
 package gov.nist.secauto.metaschema.core.model.constraint;
 
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
-
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -40,7 +38,7 @@
 public abstract class AbstractTargetedConstraints<T extends IValueConstrained>
     implements ITargetedConstraints, IFeatureValueConstrained {
   @NonNull
-  private final MetapathExpression targetExpression;
+  private final String targetExpression;
   @NonNull
   private final T constraints;
 
@@ -53,14 +51,14 @@ public abstract class AbstractTargetedConstraints<T extends IValueConstrained>
    *          the constraints to apply to matching targets
    */
   protected AbstractTargetedConstraints(
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull T constraints) {
     this.targetExpression = target;
     this.constraints = constraints;
   }
 
   @Override
-  public MetapathExpression getTargetExpression() {
+  public String getTargetExpression() {
     return targetExpression;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AssemblyTargetedConstraints.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AssemblyTargetedConstraints.java
index 59193ee9e..0822720e3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AssemblyTargetedConstraints.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/AssemblyTargetedConstraints.java
@@ -26,7 +26,6 @@
 
 package gov.nist.secauto.metaschema.core.model.constraint;
 
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.constraint.impl.AbstractDefinitionTargetedConstraints;
 
@@ -51,7 +50,7 @@ public class AssemblyTargetedConstraints
    *          the constraints to apply to matching targets
    */
   public AssemblyTargetedConstraints(
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull IModelConstrained constraints) {
     super(target, constraints);
   }
@@ -62,11 +61,10 @@ public void target(@NonNull IAssemblyDefinition definition) {
   }
 
   @Override
-  @SuppressWarnings("null")
   protected void applyTo(@NonNull IAssemblyDefinition definition) {
     super.applyTo(definition);
-    getIndexConstraints().forEach(constraint -> definition.addConstraint(constraint));
-    getUniqueConstraints().forEach(constraint -> definition.addConstraint(constraint));
-    getHasCardinalityConstraints().forEach(constraint -> definition.addConstraint(constraint));
+    getIndexConstraints().forEach(definition::addConstraint);
+    getUniqueConstraints().forEach(definition::addConstraint);
+    getHasCardinalityConstraints().forEach(definition::addConstraint);
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintValidationFinding.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintValidationFinding.java
index 257a6ecdb..fd6470c3f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintValidationFinding.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ConstraintValidationFinding.java
@@ -27,12 +27,13 @@
 package gov.nist.secauto.metaschema.core.model.constraint;
 
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level;
 import gov.nist.secauto.metaschema.core.model.validation.IValidationFinding;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.net.URI;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
@@ -45,45 +46,113 @@
 public class ConstraintValidationFinding implements IValidationFinding { // NOPMD - intentional
   @NonNull
   private final List<? extends IConstraint> constraints;
-  @NonNull
-  private final CharSequence message;
+  @Nullable
+  private final String message;
   @NonNull
   private final INodeItem node;
   @NonNull
-  private final List<? extends INodeItem> targets;
+  private final INodeItem target;
+  @NonNull
+  private final List<? extends INodeItem> subjects;
   private final Throwable cause;
+  @NonNull
+  private final Kind kind;
+  @NonNull
   private final Level severity;
 
   private ConstraintValidationFinding(
       @NonNull List<? extends IConstraint> constraints,
       @NonNull INodeItem node,
-      @NonNull CharSequence message,
-      @NonNull List<? extends INodeItem> targets,
+      @Nullable String message,
+      @NonNull INodeItem target,
+      @NonNull List<? extends INodeItem> subjects,
+      @NonNull Kind kind,
       @NonNull Level severity,
       @Nullable Throwable cause) {
     this.constraints = constraints;
     this.node = node;
     this.message = message;
-    this.targets = targets;
+    this.target = target;
+    this.subjects = subjects;
+    this.kind = kind;
     this.severity = severity;
     this.cause = cause;
   }
 
+  @Override
+  public String getIdentifier() {
+    return constraints.size() == 1 ? constraints.get(0).getId() : null;
+  }
+
+  /**
+   * Get the constraints associated with the finding.
+   *
+   * @return the constraints
+   */
+  @NonNull
   public List<? extends IConstraint> getConstraints() {
     return constraints;
   }
 
   @Override
-  public CharSequence getMessage() {
+  public String getMessage() {
     return message;
   }
 
+  /**
+   * Get the context node used to evaluate the constraints.
+   *
+   * @return the context node
+   */
+  @NonNull
   public INodeItem getNode() {
     return node;
   }
 
-  public List<? extends INodeItem> getTargets() {
-    return targets;
+  /**
+   * Get the target of the finding.
+   *
+   * @return the target node
+   */
+  @NonNull
+  public INodeItem getTarget() {
+    return target;
+  }
+
+  /**
+   * Get the subjects of the finding, which are resolved by evaluating the
+   * constraint target expression.
+   *
+   * @return the subject nodes
+   */
+  @NonNull
+  public List<? extends INodeItem> getSubjects() {
+    return subjects;
+  }
+
+  @Override
+  public IResourceLocation getLocation() {
+    // first try the target
+    INodeItem node = getTarget();
+    IResourceLocation retval = node.getLocation();
+    if (retval == null) {
+      // if no location, try the parent
+      node = node.getParentContentNodeItem();
+      if (node != null) {
+        retval = node.getLocation();
+      }
+    }
+    return retval;
+  }
+
+  @Override
+  public String getPathKind() {
+    return "metapath";
+  }
+
+  @Override
+  public String getPath() {
+    return getTarget().getMetapath();
   }
 
   @Override
@@ -91,23 +160,44 @@ public Throwable getCause() {
     return cause;
   }
 
-  @SuppressWarnings("null")
+  @Override
+  public Kind getKind() {
+    return kind;
+  }
+
   @Override
   public Level getSeverity() {
     return severity;
   }
 
-  @SuppressWarnings("null")
   @Override
-  public @NonNull URI getDocumentUri() {
-    return getNode().getBaseUri();
+  public URI getDocumentUri() {
+    return getTarget().getBaseUri();
   }
 
+  /**
+   * Construct a new finding builder.
+   *
+   * @param constraints
+   *          the constraints associated with this finding
+   * @param node
+   *          the context node used to evaluate the constraints
+   * @return a new builder
+   */
   @NonNull
   public static Builder builder(@NonNull List<? extends IConstraint> constraints, @NonNull INodeItem node) {
     return new Builder(constraints, node);
   }
 
+  /**
+   * Construct a new finding builder.
+   *
+   * @param constraint
+   *          the constraint associated with this finding
+   * @param node
+   *          the context node used to evaluate the constraints
+   * @return a new builder
+   */
   @NonNull
   public static Builder builder(@NonNull IConstraint constraint, @NonNull INodeItem node) {
     return new Builder(CollectionUtil.singletonList(constraint), node);
@@ -118,68 +208,121 @@ public static final class Builder {
     private final List<? extends IConstraint> constraints;
     @NonNull
     private final INodeItem node;
-    private CharSequence message;
-    private List<? extends INodeItem> targets;
+    @NonNull
+    private INodeItem target;
+    private String message;
+    private List<? extends INodeItem> subjects;
     private Throwable cause;
+    private Kind kind;
     private Level severity;
 
     private Builder(@NonNull List<? extends IConstraint> constraints, @NonNull INodeItem node) {
       this.constraints = constraints;
       this.node = node;
+      this.target = node;
     }
 
-    @NonNull
-    public Builder message(@NonNull CharSequence message) {
-      this.message = message;
+    /**
+     * Use the provided target for the validation finding.
+     *
+     * @param target
+     *          the finding target
+     * @return this builder
+     */
+    public Builder target(@NonNull INodeItem target) {
+      this.target = target;
       return this;
     }
 
+    /**
+     * Use the provided message for the validation finding.
+     *
+     * @param message
+     *          the message target
+     * @return this builder
+     */
     @NonNull
-    public Builder target(@NonNull INodeItem target) {
-      this.targets = Collections.singletonList(target);
+    public Builder message(@NonNull String message) {
+      this.message = message;
       return this;
     }
 
+    /**
+     * Use the provided subjects for the validation finding.
+     *
+     * @param subjects
+     *          the finding subjects
+     * @return this builder
+     */
     @NonNull
-    public Builder targets(@NonNull List<? extends INodeItem> targets) {
-      this.targets = CollectionUtil.unmodifiableList(targets);
+    public Builder subjects(@NonNull List<? extends INodeItem> subjects) {
+      this.subjects = CollectionUtil.unmodifiableList(subjects);
       return this;
     }
 
+    /**
+     * Use the provided cause for the validation finding.
+     *
+     * @param cause
+     *          the finding cause
+     * @return this builder
+     */
     @NonNull
     public Builder cause(@NonNull Throwable cause) {
       this.cause = cause;
       return this;
     }
 
+    /**
+     * Use the provided kind for the validation finding.
+     *
+     * @param kind
+     *          the finding kind
+     * @return this builder
+     */
+    @NonNull
+    public Builder kind(@NonNull Kind kind) {
+      this.kind = kind;
+      return this;
+    }
+
+    /**
+     * Use the provided severity for the validation finding.
+     *
+     * @param severity
+     *          the finding severity
+     * @return this builder
+     */
     @NonNull
     public Builder severity(@NonNull Level severity) {
       this.severity = severity;
       return this;
     }
 
+    /**
+     * Generate the finding using the previously provided data.
+     *
+     * @return a new finding
+     */
     @NonNull
     public ConstraintValidationFinding build() {
-      if (message == null) {
-        throw new IllegalStateException("Missing message");
-      }
-
-      Level severity = this.severity == null ? constraints.stream()
+      Level severity = ObjectUtils.notNull(this.severity == null ? constraints.stream()
           .map(IConstraint::getLevel)
           .max(Comparator.comparing(Level::ordinal))
-          .get() : this.severity;
+          .get() : this.severity);
 
-      List<? extends INodeItem> targets = this.targets == null ? CollectionUtil.emptyList() : this.targets;
+      List<? extends INodeItem> subjects = this.subjects == null ? CollectionUtil.emptyList() : this.subjects;
 
-      assert message != null;
-      assert targets != null;
-      assert severity != null;
+      assert subjects != null;
+      assert kind != null;
 
       return new ConstraintValidationFinding(
           constraints,
           node,
           message,
-          targets,
+          target,
+          subjects,
+          kind,
           severity,
           cause);
     }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java
index 2f4a0ca98..4426638ed 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidator.java
@@ -26,6 +26,9 @@
 
 package gov.nist.secauto.metaschema.core.model.constraint;
 
+import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration;
+import gov.nist.secauto.metaschema.core.configuration.IConfiguration;
+import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
@@ -36,7 +39,6 @@
 import gov.nist.secauto.metaschema.core.metapath.item.node.AbstractNodeItemVisitor;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IFieldNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem;
@@ -45,7 +47,9 @@
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -58,6 +62,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -66,8 +72,12 @@
  * <p>
  * This class is not thread safe.
  */
-@SuppressWarnings("PMD.CouplingBetweenObjects")
-public class DefaultConstraintValidator implements IConstraintValidator { // NOPMD - intentional
+@SuppressWarnings({
+    "PMD.CouplingBetweenObjects",
+    "PMD.GodClass" // provides validators for all types
+})
+public class DefaultConstraintValidator
+    implements IConstraintValidator, IMutableConfiguration<ValidationFeature<?>> { // NOPMD - intentional
   private static final Logger LOGGER = LogManager.getLogger(DefaultConstraintValidator.class);
 
   @NonNull
@@ -78,6 +88,8 @@ public class DefaultConstraintValidator implements IConstraintValidator { // NOP
   private final Map<String, List<KeyRef>> indexNameToKeyRefMap = new ConcurrentHashMap<>();
   @NonNull
   private final IConstraintValidationHandler handler;
+  @NonNull
+  private final IMutableConfiguration<ValidationFeature<?>> configuration;
 
   /**
    * Construct a new constraint validator instance.
@@ -85,8 +97,53 @@ public class DefaultConstraintValidator implements IConstraintValidator { // NOP
    * @param handler
    *          the validation handler to use for handling constraint violations
    */
-  public DefaultConstraintValidator(@NonNull IConstraintValidationHandler handler) {
+  public DefaultConstraintValidator(
+      @NonNull IConstraintValidationHandler handler) {
     this.handler = handler;
+    this.configuration = new DefaultConfiguration<>();
+  }
+
+  /**
+   * Get the current configuration of the serializer/deserializer.
+   *
+   * @return the configuration
+   */
+  @NonNull
+  protected IMutableConfiguration<ValidationFeature<?>> getConfiguration() {
+    return configuration;
+  }
+
+  @Override
+  public DefaultConstraintValidator enableFeature(ValidationFeature<?> feature) {
+    return set(feature, true);
+  }
+
+  @Override
+  public DefaultConstraintValidator disableFeature(ValidationFeature<?> feature) {
+    return set(feature, false);
+  }
+
+  @Override
+  public DefaultConstraintValidator applyConfiguration(
+      @NonNull IConfiguration<ValidationFeature<?>> other) {
+    getConfiguration().applyConfiguration(other);
+    return this;
+  }
+
+  @Override
+  public DefaultConstraintValidator set(ValidationFeature<?> feature, Object value) {
+    getConfiguration().set(feature, value);
+    return this;
+  }
+
+  @Override
+  public boolean isFeatureEnabled(ValidationFeature<?> feature) {
+    return getConfiguration().isFeatureEnabled(feature);
+  }
+
+  @Override
+  public Map<ValidationFeature<?>, Object> getFeatureValues() {
+    return getConfiguration().getFeatureValues();
   }
 
   /**
@@ -223,14 +280,23 @@ private void validateHasCardinality(
       @NonNull ISequence<? extends INodeItem> targets) {
     int itemCount = targets.size();
 
+    IConstraintValidationHandler handler = getConstraintValidationHandler();
+
+    boolean violation = false;
     Integer minOccurs = constraint.getMinOccurs();
     if (minOccurs != null && itemCount < minOccurs) {
-      getConstraintValidationHandler().handleCardinalityMinimumViolation(constraint, node, targets);
+      handler.handleCardinalityMinimumViolation(constraint, node, targets);
+      violation = true;
     }
 
     Integer maxOccurs = constraint.getMaxOccurs();
     if (maxOccurs != null && itemCount > maxOccurs) {
-      getConstraintValidationHandler().handleCardinalityMaximumViolation(constraint, node, targets);
+      handler.handleCardinalityMaximumViolation(constraint, node, targets);
+      violation = true;
+    }
+
+    if (!violation) {
+      handlePass(constraint, node, node);
     }
   }
 
@@ -282,27 +348,39 @@ private void validateIndex(
       @NonNull ISequence<? extends INodeItem> targets,
       @NonNull DynamicContext dynamicContext) {
     String indexName = constraint.getName();
-    if (indexNameToIndexMap.containsKey(indexName)) {
-      getConstraintValidationHandler().handleIndexDuplicateViolation(constraint, node);
-      return; // NOPMD - readability
-    }
 
-    IIndex index = IIndex.newInstance(constraint.getKeyFields());
-    targets.asStream()
-        .forEachOrdered(item -> {
-          assert item != null;
-          if (item.hasValue()) {
-            try {
-              INodeItem oldItem = index.put(item, dynamicContext);
-              if (oldItem != null) {
-                getConstraintValidationHandler().handleIndexDuplicateKeyViolation(constraint, node, oldItem, item);
+    IConstraintValidationHandler handler = getConstraintValidationHandler();
+    if (indexNameToIndexMap.containsKey(indexName)) {
+      handler.handleIndexDuplicateViolation(constraint, node);
+    } else {
+      IIndex index = IIndex.newInstance(constraint.getKeyFields());
+      targets.stream()
+          .forEachOrdered(item -> {
+            assert item != null;
+            if (item.hasValue()) {
+              try {
+                INodeItem oldItem = index.put(item, dynamicContext);
+                if (oldItem == null) {
+                  handlePass(constraint, node, item);
+                } else {
+                  handler.handleIndexDuplicateKeyViolation(constraint, node, oldItem, item);
+                }
+              } catch (MetapathException ex) {
+                handler.handleKeyMatchError(constraint, node, item, ex);
               }
-            } catch (MetapathException ex) {
-              getConstraintValidationHandler().handleKeyMatchError(constraint, node, item, ex);
             }
-          }
-        });
-    indexNameToIndexMap.put(indexName, index);
+          });
+      indexNameToIndexMap.put(indexName, index);
+    }
+  }
+
+  private void handlePass(
+      @NonNull IConstraint constraint,
+      @NonNull INodeItem node,
+      @NonNull INodeItem item) {
+    if (isFeatureEnabled(ValidationFeature.VALIDATE_GENERATE_PASS_FINDINGS)) {
+      getConstraintValidationHandler().handlePass(constraint, node, item);
+    }
   }
 
   /**
@@ -352,18 +430,22 @@ private void validateUnique(
       @NonNull IAssemblyNodeItem node,
       @NonNull ISequence<? extends INodeItem> targets,
       @NonNull DynamicContext dynamicContext) {
+
+    IConstraintValidationHandler handler = getConstraintValidationHandler();
     IIndex index = IIndex.newInstance(constraint.getKeyFields());
-    targets.asStream()
+    targets.stream()
         .forEachOrdered(item -> {
           assert item != null;
           if (item.hasValue()) {
             try {
               INodeItem oldItem = index.put(item, dynamicContext);
-              if (oldItem != null) {
-                getConstraintValidationHandler().handleUniqueKeyViolation(constraint, node, oldItem, item);
+              if (oldItem == null) {
+                handlePass(constraint, node, item);
+              } else {
+                handler.handleUniqueKeyViolation(constraint, node, oldItem, item);
               }
             } catch (MetapathException ex) {
-              getConstraintValidationHandler().handleKeyMatchError(constraint, node, item, ex);
+              handler.handleKeyMatchError(constraint, node, item, ex);
               throw ex;
             }
           }
@@ -414,30 +496,45 @@ private void validateMatches(
       @NonNull IMatchesConstraint constraint,
       @NonNull INodeItem node,
       @NonNull ISequence<? extends INodeItem> targets) {
-    targets.asStream()
+    targets.stream()
         .forEachOrdered(item -> {
           assert item != null;
           if (item.hasValue()) {
-            String value = FnData.fnDataItem(item).asString();
-
-            Pattern pattern = constraint.getPattern();
-            if (pattern != null && !pattern.asMatchPredicate().test(value)) {
-              // failed pattern match
-              getConstraintValidationHandler().handleMatchPatternViolation(constraint, node, item, value);
-            }
-
-            IDataTypeAdapter<?> adapter = constraint.getDataType();
-            if (adapter != null) {
-              try {
-                adapter.parse(value);
-              } catch (IllegalArgumentException ex) {
-                getConstraintValidationHandler().handleMatchDatatypeViolation(constraint, node, item, value, ex);
-              }
-            }
+            validateMatchesItem(constraint, node, item);
           }
         });
   }
 
+  private void validateMatchesItem(
+      @NonNull IMatchesConstraint constraint,
+      @NonNull INodeItem node,
+      @NonNull INodeItem item) {
+    String value = FnData.fnDataItem(item).asString();
+
+    IConstraintValidationHandler handler = getConstraintValidationHandler();
+    boolean valid = true;
+    Pattern pattern = constraint.getPattern();
+    if (pattern != null && !pattern.asMatchPredicate().test(value)) {
+      // failed pattern match
+      handler.handleMatchPatternViolation(constraint, node, item, value, pattern);
+      valid = false;
+    }
+
+    IDataTypeAdapter<?> adapter = constraint.getDataType();
+    if (adapter != null) {
+      try {
+        adapter.parse(value);
+      } catch (IllegalArgumentException ex) {
+        handler.handleMatchDatatypeViolation(constraint, node, item, value, adapter, ex);
+        valid = false;
+      }
+    }
+
+    if (valid) {
+      handlePass(constraint, node, item);
+    }
+  }
+
   /**
    * Evaluates the provided collection of {@code constraints} in the context of
    * the {@code item}.
@@ -486,7 +583,7 @@ private void validateIndexHasKey(
       indexNameToKeyRefMap.put(indexName, keyRefItems);
     }
 
-    KeyRef keyRef = new KeyRef(constraint, node, new ArrayList<>(targets.asList()));
+    KeyRef keyRef = new KeyRef(constraint, node, new ArrayList<>(targets.getValue()));
     keyRefItems.add(keyRef);
   }
 
@@ -533,16 +630,21 @@ private void validateExpect(
       @NonNull INodeItem node,
       @NonNull ISequence<? extends INodeItem> targets,
       @NonNull DynamicContext dynamicContext) {
-    targets.asStream()
-        .map(item -> (INodeItem) item)
+    MetapathExpression metapath = MetapathExpression.compile(
+        constraint.getTest(),
+        dynamicContext.getStaticContext());
+
+    IConstraintValidationHandler handler = getConstraintValidationHandler();
+    targets.stream()
         .forEachOrdered(item -> {
           assert item != null;
           if (item.hasValue()) {
-            MetapathExpression metapath = constraint.getTest();
             try {
               ISequence<?> result = metapath.evaluate(item, dynamicContext);
-              if (!FnBoolean.fnBoolean(result).toBoolean()) {
-                getConstraintValidationHandler().handleExpectViolation(constraint, node, item, dynamicContext);
+              if (FnBoolean.fnBoolean(result).toBoolean()) {
+                handlePass(constraint, node, item);
+              } else {
+                handler.handleExpectViolation(constraint, node, item, dynamicContext);
               }
             } catch (MetapathException ex) {
               rethrowConstraintError(constraint, item, ex);
@@ -569,7 +671,7 @@ private void validateAllowedValues(
       @NonNull DynamicContext dynamicContext) {
     for (IAllowedValuesConstraint constraint : constraints) {
       ISequence<? extends IDefinitionNodeItem<?, ?>> targets = constraint.matchTargets(item, dynamicContext);
-      validateAllowedValues(constraint, targets);
+      validateAllowedValues(constraint, item, targets);
     }
   }
 
@@ -579,18 +681,22 @@ private void validateAllowedValues(
    *
    * @param constraint
    *          the constraint to execute
+   * @param node
+   *          the original focus of Metapath evaluation for identifying the
+   *          targets
    * @param targets
    *          the focus of Metapath evaluation for evaluating any constraint
    *          Metapath clauses
    */
   private void validateAllowedValues(
       @NonNull IAllowedValuesConstraint constraint,
+      @NonNull IDefinitionNodeItem<?, ?> node,
       @NonNull ISequence<? extends IDefinitionNodeItem<?, ?>> targets) {
-    targets.asStream().forEachOrdered(item -> {
+    targets.stream().forEachOrdered(item -> {
       assert item != null;
       if (item.hasValue()) {
         try {
-          updateValueStatus(item, constraint);
+          updateValueStatus(item, constraint, node);
         } catch (MetapathException ex) {
           rethrowConstraintError(constraint, item, ex);
         }
@@ -610,7 +716,7 @@ private static void rethrowConstraintError(
     String id = constraint.getId();
     if (id == null) {
       builder.append(" targeting the metapath '")
-          .append(constraint.getTarget().getPath())
+          .append(constraint.getTarget())
           .append('\'');
     } else {
       builder.append(" with id '")
@@ -632,9 +738,15 @@ private static void rethrowConstraintError(
    * @param targetItem
    *          the item whose value is targeted by the constraint
    * @param allowedValues
-   *          the set of allowed values
+   *          the allowed values constraint
+   * @param node
+   *          the original focus of Metapath evaluation for identifying the
+   *          targets
    */
-  protected void updateValueStatus(@NonNull INodeItem targetItem, @NonNull IAllowedValuesConstraint allowedValues) {
+  protected void updateValueStatus(
+      @NonNull INodeItem targetItem,
+      @NonNull IAllowedValuesConstraint allowedValues,
+      @NonNull IDefinitionNodeItem<?, ?> node) {
     // constraint.getAllowedValues().containsKey(value)
 
     @Nullable ValueStatus valueStatus = valueMap.get(targetItem);
@@ -643,7 +755,7 @@ protected void updateValueStatus(@NonNull INodeItem targetItem, @NonNull IAllowe
       valueMap.put(targetItem, valueStatus);
     }
 
-    valueStatus.registerAllowedValue(allowedValues);
+    valueStatus.registerAllowedValue(allowedValues, node);
   }
 
   /**
@@ -664,41 +776,56 @@ protected void handleAllowedValues(@NonNull INodeItem targetItem) {
   public void finalizeValidation(DynamicContext dynamicContext) {
     // key references
     for (Map.Entry<String, List<KeyRef>> entry : indexNameToKeyRefMap.entrySet()) {
-      String indexName = entry.getKey();
+      String indexName = ObjectUtils.notNull(entry.getKey());
       IIndex index = indexNameToIndexMap.get(indexName);
 
       List<KeyRef> keyRefs = entry.getValue();
 
       for (KeyRef keyRef : keyRefs) {
         IIndexHasKeyConstraint constraint = keyRef.getConstraint();
-        for (INodeItem item : keyRef.getTargets()) {
+
+        INodeItem node = keyRef.getNode();
+        List<INodeItem> targets = keyRef.getTargets();
+        for (INodeItem item : targets) {
           assert item != null;
 
-          try {
-            List<String> key = IIndex.toKey(item, constraint.getKeyFields(), dynamicContext);
+          validateKeyRef(constraint, node, item, indexName, index, dynamicContext);
+        }
+      }
+    }
+  }
 
-            if (index == null) {
-              getConstraintValidationHandler().handleGenericValidationViolation(constraint, keyRef.getNode(), item,
-                  String.format("Key reference to undefined index with name '%s'", indexName));
-            } else {
+  private void validateKeyRef(
+      @NonNull IIndexHasKeyConstraint constraint,
+      @NonNull INodeItem contextNode,
+      @NonNull INodeItem item,
+      @NonNull String indexName,
+      @Nullable IIndex index,
+      @NonNull DynamicContext dynamicContext) {
+    IConstraintValidationHandler handler = getConstraintValidationHandler();
+    try {
+      List<String> key = IIndex.toKey(item, constraint.getKeyFields(), dynamicContext);
 
-              INodeItem referencedItem = index.get(key);
+      if (index == null) {
+        handler.handleMissingIndexViolation(constraint, contextNode, item, ObjectUtils.notNull(
+            String.format("Key reference to undefined index with name '%s'", indexName)));
+      } else {
+        INodeItem referencedItem = index.get(key);
 
-              if (referencedItem == null) {
-                getConstraintValidationHandler().handleIndexMiss(constraint, keyRef.getNode(), item, key);
-              }
-            }
-          } catch (MetapathException ex) {
-            getConstraintValidationHandler().handleKeyMatchError(constraint, keyRef.getNode(), item, ex);
-          }
+        if (referencedItem == null) {
+          handler.handleIndexMiss(constraint, contextNode, item, key);
+        } else {
+          handlePass(constraint, contextNode, item);
         }
       }
+    } catch (MetapathException ex) {
+      handler.handleKeyMatchError(constraint, contextNode, item, ex);
     }
   }
 
   private class ValueStatus {
     @NonNull
-    private final List<IAllowedValuesConstraint> constraints = new LinkedList<>();
+    private final List<Pair<IAllowedValuesConstraint, IDefinitionNodeItem<?, ?>>> constraints = new LinkedList<>();
     @NonNull
     private final String value;
     @NonNull
@@ -712,8 +839,10 @@ public ValueStatus(@NonNull INodeItem item) {
       this.value = FnData.fnDataItem(item).asString();
     }
 
-    public void registerAllowedValue(@NonNull IAllowedValuesConstraint allowedValues) {
-      this.constraints.add(allowedValues);
+    public void registerAllowedValue(
+        @NonNull IAllowedValuesConstraint allowedValues,
+        @NonNull IDefinitionNodeItem<?, ?> node) {
+      this.constraints.add(Pair.of(allowedValues, node));
       if (!allowedValues.isAllowedOther()) {
         // record the most restrictive value
         allowOthers = false;
@@ -742,10 +871,14 @@ public void validate() {
       if (!constraints.isEmpty()) {
         boolean match = false;
         List<IAllowedValuesConstraint> failedConstraints = new LinkedList<>();
-        for (IAllowedValuesConstraint allowedValues : constraints) {
+        IConstraintValidationHandler handler = getConstraintValidationHandler();
+        for (Pair<IAllowedValuesConstraint, IDefinitionNodeItem<?, ?>> pair : constraints) {
+          IAllowedValuesConstraint allowedValues = pair.getLeft();
+          IDefinitionNodeItem<?, ?> node = ObjectUtils.notNull(pair.getRight());
           IAllowedValue matchingValue = allowedValues.getAllowedValue(value);
           if (matchingValue != null) {
             match = true;
+            handlePass(allowedValues, node, item);
           } else if (IAllowedValuesConstraint.Extensible.NONE.equals(allowedValues.getExtensible())) {
             // hard failure, since no other values can satisfy this constraint
             failedConstraints = CollectionUtil.singletonList(allowedValues);
@@ -758,7 +891,7 @@ public void validate() {
 
         // it's not a failure if allow others is true
         if (!match && !allowOthers) {
-          getConstraintValidationHandler().handleAllowedValuesViolation(failedConstraints, item);
+          handler.handleAllowedValuesViolation(failedConstraints, item);
         }
       }
     }
@@ -770,7 +903,7 @@ class Visitor
     @NonNull
     private DynamicContext handleLetStatements(
         @NonNull INodeItem focus,
-        @NonNull Map<String, ILet> letExpressions,
+        @NonNull Map<QName, ILet> letExpressions,
         @NonNull DynamicContext dynamicContext) {
 
       DynamicContext retval;
@@ -781,8 +914,12 @@ private DynamicContext handleLetStatements(
         final DynamicContext subContext = dynamicContext.subContext();
 
         for (ILet let : lets) {
-          String name = let.getName();
+          QName name = let.getName();
           ISequence<?> result = let.getValueExpression().evaluate(focus, subContext);
+
+          // ensure the sequence is list backed
+          result.getValue();
+
           subContext.bindVariableValue(name, result);
         }
         retval = subContext;
@@ -790,11 +927,6 @@ private DynamicContext handleLetStatements(
       return retval;
     }
 
-    @Override
-    public Void visitDocument(@NonNull IDocumentNodeItem item, DynamicContext context) {
-      return super.visitDocument(item, context);
-    }
-
     @Override
     public Void visitFlag(@NonNull IFlagNodeItem item, DynamicContext context) {
       assert context != null;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FieldTargetedConstraints.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FieldTargetedConstraints.java
index 386f11095..201e64b6e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FieldTargetedConstraints.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FieldTargetedConstraints.java
@@ -26,7 +26,6 @@
 
 package gov.nist.secauto.metaschema.core.model.constraint;
 
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.constraint.impl.AbstractDefinitionTargetedConstraints;
 
@@ -50,7 +49,7 @@ public class FieldTargetedConstraints
    *          the constraints to apply to matching targets
    */
   public FieldTargetedConstraints(
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull IValueConstrained constraints) {
     super(target, constraints);
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java
index d671cc38b..ebfc278e4 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java
@@ -26,16 +26,20 @@
 
 package gov.nist.secauto.metaschema.core.model.constraint;
 
+import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
 import gov.nist.secauto.metaschema.core.metapath.MetapathException;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level;
+import gov.nist.secauto.metaschema.core.model.validation.IValidationFinding.Kind;
 import gov.nist.secauto.metaschema.core.model.validation.IValidationResult;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -74,13 +78,39 @@ protected void addFinding(@NonNull ConstraintValidationFinding finding) {
     }
   }
 
+  @NonNull
+  private static Kind toKind(@NonNull Level level) {
+    Kind retval;
+    switch (level) {
+    case CRITICAL:
+    case ERROR:
+      retval = Kind.FAIL;
+      break;
+    case INFORMATIONAL:
+    case DEBUG:
+    case NONE:
+      retval = Kind.INFORMATIONAL;
+      break;
+    case WARNING:
+      retval = Kind.PASS;
+      break;
+    default:
+      throw new IllegalArgumentException(String.format("Unsupported level '%s'.", level));
+    }
+
+    return retval;
+  }
+
   @Override
   public void handleCardinalityMinimumViolation(
       @NonNull ICardinalityConstraint constraint,
       @NonNull INodeItem node,
       @NonNull ISequence<? extends INodeItem> targets) {
     addFinding(ConstraintValidationFinding.builder(constraint, node)
-        .targets(targets.asList())
+        .severity(constraint.getLevel())
+        .kind(toKind(constraint.getLevel()))
+        .target(node)
+        .subjects(targets.getValue())
         .message(newCardinalityMinimumViolationMessage(constraint, node, targets))
         .build());
   }
@@ -91,7 +121,10 @@ public void handleCardinalityMaximumViolation(
       @NonNull INodeItem node,
       @NonNull ISequence<? extends INodeItem> targets) {
     addFinding(ConstraintValidationFinding.builder(constraint, node)
-        .targets(targets.asList())
+        .severity(constraint.getLevel())
+        .kind(toKind(constraint.getLevel()))
+        .target(node)
+        .subjects(targets.getValue())
         .message(newCardinalityMaximumViolationMessage(constraint, node, targets))
         .build());
   }
@@ -103,6 +136,8 @@ public void handleIndexDuplicateKeyViolation(
       @NonNull INodeItem oldItem,
       @NonNull INodeItem target) {
     addFinding(ConstraintValidationFinding.builder(constraint, node)
+        .severity(constraint.getLevel())
+        .kind(toKind(constraint.getLevel()))
         .target(target)
         .message(newIndexDuplicateKeyViolationMessage(constraint, node, oldItem, target))
         .build());
@@ -115,6 +150,8 @@ public void handleUniqueKeyViolation(
       @NonNull INodeItem oldItem,
       @NonNull INodeItem target) {
     addFinding(ConstraintValidationFinding.builder(constraint, node)
+        .severity(constraint.getLevel())
+        .kind(toKind(constraint.getLevel()))
         .target(target)
         .message(newUniqueKeyViolationMessage(constraint, node, oldItem, target))
         .build());
@@ -128,6 +165,8 @@ public void handleKeyMatchError(
       @NonNull INodeItem target,
       @NonNull MetapathException cause) {
     addFinding(ConstraintValidationFinding.builder(constraint, node)
+        .severity(constraint.getLevel())
+        .kind(toKind(constraint.getLevel()))
         .target(target)
         .message(cause.getLocalizedMessage())
         .cause(cause)
@@ -139,10 +178,13 @@ public void handleMatchPatternViolation(
       @NonNull IMatchesConstraint constraint,
       @NonNull INodeItem node,
       @NonNull INodeItem target,
-      @NonNull String value) {
+      @NonNull String value,
+      @NonNull Pattern pattern) {
     addFinding(ConstraintValidationFinding.builder(constraint, node)
+        .severity(constraint.getLevel())
+        .kind(toKind(constraint.getLevel()))
         .target(target)
-        .message(newMatchPatternViolationMessage(constraint, node, target, value))
+        .message(newMatchPatternViolationMessage(constraint, node, target, value, pattern))
         .build());
   }
 
@@ -152,10 +194,13 @@ public void handleMatchDatatypeViolation(
       @NonNull INodeItem node,
       @NonNull INodeItem target,
       @NonNull String value,
+      @NonNull IDataTypeAdapter<?> adapter,
       @NonNull IllegalArgumentException cause) {
     addFinding(ConstraintValidationFinding.builder(constraint, node)
+        .severity(constraint.getLevel())
+        .kind(toKind(constraint.getLevel()))
         .target(target)
-        .message(newMatchDatatypeViolationMessage(constraint, node, target, value))
+        .message(newMatchDatatypeViolationMessage(constraint, node, target, value, adapter))
         .cause(cause)
         .build());
   }
@@ -167,15 +212,24 @@ public void handleExpectViolation(
       @NonNull INodeItem target,
       @NonNull DynamicContext dynamicContext) {
     addFinding(ConstraintValidationFinding.builder(constraint, node)
+        .severity(constraint.getLevel())
+        .kind(toKind(constraint.getLevel()))
         .target(target)
         .message(newExpectViolationMessage(constraint, node, target, dynamicContext))
         .build());
   }
 
   @Override
-  public void handleAllowedValuesViolation(@NonNull List<IAllowedValuesConstraint> failedConstraints,
+  public void handleAllowedValuesViolation(
+      @NonNull List<IAllowedValuesConstraint> failedConstraints,
       @NonNull INodeItem target) {
+    Level maxLevel = ObjectUtils.notNull(failedConstraints.stream()
+        .map(IAllowedValuesConstraint::getLevel)
+        .reduce(Level.NONE, (l1, l2) -> l1.ordinal() >= l2.ordinal() ? l1 : l2));
+
     addFinding(ConstraintValidationFinding.builder(failedConstraints, target)
+        .severity(maxLevel)
+        .kind(toKind(maxLevel))
         .target(target)
         .message(newAllowedValuesViolationMessage(failedConstraints, target))
         .build());
@@ -184,6 +238,8 @@ public void handleAllowedValuesViolation(@NonNull List<IAllowedValuesConstraint>
   @Override
   public void handleIndexDuplicateViolation(IIndexConstraint constraint, INodeItem node) {
     addFinding(ConstraintValidationFinding.builder(constraint, node)
+        .kind(Kind.FAIL)
+        .target(node)
         .message(newIndexDuplicateViolationMessage(constraint, node))
         .severity(Level.CRITICAL)
         .build());
@@ -192,15 +248,33 @@ public void handleIndexDuplicateViolation(IIndexConstraint constraint, INodeItem
   @Override
   public void handleIndexMiss(IIndexHasKeyConstraint constraint, INodeItem node, INodeItem target, List<String> key) {
     addFinding(ConstraintValidationFinding.builder(constraint, node)
+        .severity(constraint.getLevel())
+        .kind(toKind(constraint.getLevel()))
+        .target(target)
         .message(newIndexMissMessage(constraint, node, target, key))
         .build());
   }
 
   @Override
-  public void handleGenericValidationViolation(IConstraint constraint, INodeItem node, INodeItem target,
+  public void handleMissingIndexViolation(
+      IIndexHasKeyConstraint constraint,
+      INodeItem node,
+      INodeItem target,
       String message) {
     addFinding(ConstraintValidationFinding.builder(constraint, node)
-        .message(newGenericValidationViolationMessage(constraint, node, target, message))
+        .severity(constraint.getLevel())
+        .kind(toKind(constraint.getLevel()))
+        .target(target)
+        .message(newMissingIndexViolationMessage(constraint, node, target, message))
+        .build());
+  }
+
+  @Override
+  public void handlePass(IConstraint constraint, INodeItem node, INodeItem target) {
+    addFinding(ConstraintValidationFinding.builder(constraint, node)
+        .target(target)
+        .severity(Level.NONE)
+        .kind(Kind.PASS)
         .build());
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FlagTargetedConstraints.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FlagTargetedConstraints.java
index d59269063..7bbdc47e5 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FlagTargetedConstraints.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/FlagTargetedConstraints.java
@@ -26,7 +26,6 @@
 
 package gov.nist.secauto.metaschema.core.model.constraint;
 
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
 import gov.nist.secauto.metaschema.core.model.constraint.impl.AbstractDefinitionTargetedConstraints;
 
@@ -50,7 +49,7 @@ public class FlagTargetedConstraints
    *          the constraints to apply to matching targets
    */
   public FlagTargetedConstraints(
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull IValueConstrained constraints) {
     super(target, constraints);
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IAllowedValuesConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IAllowedValuesConstraint.java
index 8df69d8f6..9af790685 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IAllowedValuesConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IAllowedValuesConstraint.java
@@ -108,7 +108,7 @@ default <T, R> R accept(IConstraintVisitor<T, R> visitor, T state) {
   }
 
   /**
-   * Get a new constraint builder.
+   * Create a new constraint builder.
    *
    * @return the builder
    */
@@ -129,24 +129,54 @@ private Builder() {
       // disable construction
     }
 
+    /**
+     * Use the provided allowed value to validate associated values.
+     *
+     * @param allowedValue
+     *          an expected allowed value
+     * @return this builder
+     */
     @NonNull
     public Builder allowedValue(@NonNull IAllowedValue allowedValue) {
       this.allowedValues.put(allowedValue.getValue(), allowedValue);
       return this;
     }
 
+    /**
+     * Use the provided allowed values to validate associated values.
+     *
+     * @param allowedValues
+     *          an expected allowed values
+     * @return this builder
+     */
     @NonNull
     public Builder allowedValues(@NonNull Map<String, IAllowedValue> allowedValues) {
       this.allowedValues.putAll(allowedValues);
       return this;
     }
 
+    /**
+     * Determine if unspecified values are allowed and will result in the constraint
+     * always passing.
+     *
+     * @param bool
+     *          {@code true} if other values are allowed or {@code false} otherwise
+     * @return this builder
+     */
     @NonNull
-    public Builder allowedOther(boolean bool) {
+    public Builder allowsOther(boolean bool) {
       this.allowedOther = bool;
       return this;
     }
 
+    /**
+     * Determine the allowed scope of extension for other constraints matching this
+     * constraint's target.
+     *
+     * @param extensible
+     *          the degree of allowed extension
+     * @return this builder
+     */
     @NonNull
     public Builder extensible(@NonNull Extensible extensible) {
       this.extensible = extensible;
@@ -159,16 +189,16 @@ protected Builder getThis() {
     }
 
     @NonNull
-    protected Map<String, IAllowedValue> getAllowedValues() {
+    private Map<String, IAllowedValue> getAllowedValues() {
       return allowedValues;
     }
 
-    protected boolean isAllowedOther() {
+    private boolean isAllowedOther() {
       return allowedOther;
     }
 
     @NonNull
-    protected Extensible getExtensible() {
+    private Extensible getExtensible() {
       return extensible;
     }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ICardinalityConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ICardinalityConstraint.java
index 32ffbfa62..3039dba96 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ICardinalityConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ICardinalityConstraint.java
@@ -65,6 +65,11 @@ default <T, R> R accept(IConstraintVisitor<T, R> visitor, T state) {
     return visitor.visitCardinalityConstraint(this, state);
   }
 
+  /**
+   * Create a new constraint builder.
+   *
+   * @return the builder
+   */
   @NonNull
   static Builder builder() {
     return new Builder();
@@ -79,11 +84,25 @@ private Builder() {
       // disable construction
     }
 
+    /**
+     * Use the provided minimum occurrence to validate associated targets.
+     *
+     * @param value
+     *          the expected occurrence
+     * @return this builder
+     */
     public Builder minOccurs(int value) {
       this.minOccurs = value;
       return this;
     }
 
+    /**
+     * Use the provided maximum occurrence to validate associated targets.
+     *
+     * @param value
+     *          the expected occurrence
+     * @return this builder
+     */
     public Builder maxOccurs(int value) {
       this.maxOccurs = value;
       return this;
@@ -103,11 +122,11 @@ protected void validate() {
       }
     }
 
-    protected Integer getMinOccurs() {
+    private Integer getMinOccurs() {
       return minOccurs;
     }
 
-    protected Integer getMaxOccurs() {
+    private Integer getMaxOccurs() {
       return maxOccurs;
     }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraint.java
index 4c2a94cf3..d2c79cccb 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraint.java
@@ -42,16 +42,32 @@
  * flag. Provides a common interface for all constraint definitions.
  */
 public interface IConstraint extends IAttributable, IDescribable {
+  enum Kind {
+    NOT_APPLICABLE,
+    PASS,
+    FAIL,
+    INFORMATIONAL;
+  }
+
   /**
    * The degree to which a constraint violation is significant.
    * <p>
    * These values are ordered from least significant to most significant.
    */
   enum Level {
+    /**
+     * No violation.
+     */
+    NONE,
     /**
      * A violation of the constraint represents a point of interest.
      */
     INFORMATIONAL,
+    /**
+     * A violation of the constraint represents a fault in the content that may
+     * warrant review by a developer when performing model or tool development.
+     */
+    DEBUG,
     /**
      * A violation of the constraint represents a potential issue with the content.
      */
@@ -73,11 +89,7 @@ enum Level {
    */
   @NonNull
   Level DEFAULT_LEVEL = Level.ERROR;
-  /**
-   * The default target Metapath expression to use if no target is provided.
-   */
-  @NonNull
-  MetapathExpression DEFAULT_TARGET = MetapathExpression.CONTEXT_NODE;
+
   /**
    * The default target Metapath expression to use if no target is provided.
    */
@@ -115,7 +127,7 @@ enum Level {
    * @return a Metapath expression
    */
   @NonNull
-  MetapathExpression getTarget();
+  String getTarget();
 
   /**
    * Based on the provided {@code contextNodeItem}, find all nodes matching the
@@ -129,7 +141,7 @@ enum Level {
   @NonNull
   default ISequence<? extends IDefinitionNodeItem<?, ?>> matchTargets(
       @NonNull IDefinitionNodeItem<?, ?> contextNodeItem) {
-    return getTarget().evaluate(contextNodeItem);
+    return MetapathExpression.compile(getTarget()).evaluate(contextNodeItem);
   }
 
   /**
@@ -144,9 +156,11 @@ enum Level {
    * @see #getTarget()
    */
   @NonNull
-  default ISequence<? extends IDefinitionNodeItem<?, ?>> matchTargets(@NonNull IDefinitionNodeItem<?, ?> item,
+  default ISequence<? extends IDefinitionNodeItem<?, ?>> matchTargets(
+      @NonNull IDefinitionNodeItem<?, ?> item,
       @NonNull DynamicContext dynamicContext) {
-    return item.hasValue() ? getTarget().evaluate(item, dynamicContext) : ISequence.empty();
+    return item.hasValue() ? MetapathExpression.compile(getTarget(), dynamicContext.getStaticContext())
+        .evaluate(item, dynamicContext) : ISequence.empty();
   }
 
   /**
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintSet.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintSet.java
index d2ffaef73..b0bc024ae 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintSet.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintSet.java
@@ -33,9 +33,21 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface IConstraintSet {
+  /**
+   * Get the constraints in the constraint set that apply to the provided module.
+   *
+   * @param module
+   *          a Metaschema module
+   * @return an iterator over the constraints that target the module
+   */
   @NonNull
   Iterable<ITargetedConstraints> getTargetedConstraintsForModule(@NonNull IModule module);
 
+  /**
+   * Get constraint sets imported by this constraint set.
+   *
+   * @return the imported constraint sets
+   */
   @NonNull
   Collection<IConstraintSet> getImportedConstraintSets();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintValidationHandler.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintValidationHandler.java
index afc5fed65..1e15581c8 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintValidationHandler.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IConstraintValidationHandler.java
@@ -26,81 +26,266 @@
 
 package gov.nist.secauto.metaschema.core.model.constraint;
 
+import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
 import gov.nist.secauto.metaschema.core.metapath.MetapathException;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 
 import java.util.List;
+import java.util.regex.Pattern;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface IConstraintValidationHandler {
 
+  /**
+   * Handle a cardinality constraint minimum violation.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   * @param targets
+   *          the targets of evaluation
+   */
   void handleCardinalityMinimumViolation(
       @NonNull ICardinalityConstraint constraint,
       @NonNull INodeItem node,
       @NonNull ISequence<? extends INodeItem> targets);
 
+  /**
+   * Handle a cardinality constraint maximum violation.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   * @param targets
+   *          the targets of evaluation
+   */
   void handleCardinalityMaximumViolation(
       @NonNull ICardinalityConstraint constraint,
       @NonNull INodeItem node,
       @NonNull ISequence<? extends INodeItem> targets);
 
+  /**
+   * Handle a duplicate index violation.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   */
   void handleIndexDuplicateViolation(
       @NonNull IIndexConstraint constraint,
       @NonNull INodeItem node);
 
+  /**
+   * Handle an index duplicate key violation.
+   * <p>
+   * This happens when two target nodes have the same key.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   * @param oldItem
+   *          the node that exists in the index for the related key
+   * @param target
+   *          the target of evaluation
+   */
   void handleIndexDuplicateKeyViolation(
       @NonNull IIndexConstraint constraint,
       @NonNull INodeItem node,
       @NonNull INodeItem oldItem,
       @NonNull INodeItem target);
 
+  /**
+   * Handle an unique key violation.
+   * <p>
+   * This happens when two target nodes have the same key.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   * @param oldItem
+   *          the other node with the same key
+   * @param target
+   *          the target of evaluation
+   */
   void handleUniqueKeyViolation(
       @NonNull IUniqueConstraint constraint,
       @NonNull INodeItem node,
       @NonNull INodeItem oldItem,
       @NonNull INodeItem target);
 
+  /**
+   * Handle an error that occurred while generating a key.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   * @param target
+   *          the target of evaluation
+   * @param exception
+   *          the resulting Metapath exception
+   */
+  void handleKeyMatchError(
+      @NonNull IKeyConstraint constraint,
+      @NonNull INodeItem node,
+      @NonNull INodeItem target,
+      @NonNull MetapathException exception);
+
+  /**
+   * Handle a missing index violation.
+   * <p>
+   * This happens when an index-has-key constraint references a missing index.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   * @param target
+   *          the target of evaluation
+   * @param message
+   *          the error message
+   */
+  void handleMissingIndexViolation(
+      @NonNull IIndexHasKeyConstraint constraint,
+      @NonNull INodeItem node,
+      @NonNull INodeItem target,
+      @NonNull String message);
+
+  /**
+   * Handle an index lookup key miss violation.
+   * <p>
+   * This happens when another node references an expected member of an index that
+   * does not actually exist in the index.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   * @param target
+   *          the target of evaluation
+   * @param key
+   *          the key that was used to lookup the index entry
+   */
+  void handleIndexMiss(
+      @NonNull IIndexHasKeyConstraint constraint,
+      @NonNull INodeItem node,
+      @NonNull INodeItem target,
+      @NonNull List<String> key);
+
+  /**
+   * Handle a match pattern violation.
+   * <p>
+   * This happens when the target value does not match the specified pattern.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   * @param target
+   *          the target of evaluation
+   * @param value
+   *          the value used for pattern matching
+   * @param pattern
+   *          the pattern used for pattern matching
+   */
   void handleMatchPatternViolation(
       @NonNull IMatchesConstraint constraint,
       @NonNull INodeItem node,
       @NonNull INodeItem target,
-      @NonNull String value);
+      @NonNull String value,
+      @NonNull Pattern pattern);
 
+  /**
+   * Handle a match data type violation.
+   * <p>
+   * This happens when the target value does not conform to the specified data
+   * type.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   * @param target
+   *          the target of evaluation
+   * @param value
+   *          the value used for data type matching
+   * @param adapter
+   *          the data type used for data type matching
+   * @param cause
+   *          the data type exception related to this violation
+   */
   void handleMatchDatatypeViolation(
       @NonNull IMatchesConstraint constraint,
       @NonNull INodeItem node,
       @NonNull INodeItem target,
       @NonNull String value,
+      @NonNull IDataTypeAdapter<?> adapter,
       @NonNull IllegalArgumentException cause);
 
+  /**
+   * Handle an expect test violation.
+   * <p>
+   * This happens when the test does not evaluate to true.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   * @param target
+   *          the target of evaluation
+   * @param metapathContext
+   *          the Metapath evaluation context
+   */
   void handleExpectViolation(
       @NonNull IExpectConstraint constraint,
       @NonNull INodeItem node,
       @NonNull INodeItem target,
       @NonNull DynamicContext metapathContext);
 
-  void handleKeyMatchError(
-      @NonNull IKeyConstraint constraint,
-      @NonNull INodeItem node,
-      @NonNull INodeItem target,
-      @NonNull MetapathException ex);
-
-  void handleIndexMiss(
-      @NonNull IIndexHasKeyConstraint constraint,
-      @NonNull INodeItem node,
-      @NonNull INodeItem target,
-      @NonNull List<String> key);
-
+  /**
+   * Handle an allowed values constraint violation.
+   *
+   * @param failedConstraints
+   *          the allowed values constraints that did not match.
+   * @param target
+   *          the target of evaluation
+   */
   void handleAllowedValuesViolation(
       @NonNull List<IAllowedValuesConstraint> failedConstraints,
       @NonNull INodeItem target);
 
-  void handleGenericValidationViolation(
+  /**
+   * Handle a constraint that has passed validation.
+   *
+   * @param constraint
+   *          the constraint that was evaluated
+   * @param node
+   *          the node the constraint was evaluated as the focus to determine
+   *          targets
+   * @param target
+   *          the target of evaluation
+   */
+  void handlePass(
       @NonNull IConstraint constraint,
       @NonNull INodeItem node,
-      @NonNull INodeItem target,
-      @NonNull String message);
+      @NonNull INodeItem target);
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IExpectConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IExpectConstraint.java
index 856380da4..8c3486223 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IExpectConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IExpectConstraint.java
@@ -27,7 +27,6 @@
 package gov.nist.secauto.metaschema.core.model.constraint;
 
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultExpectConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -40,26 +39,45 @@
  * <p>
  * A custom message can be used to indicate what a test failure signifies.
  */
-
 public interface IExpectConstraint extends IConstraint {
+  /**
+   * Get the test to use to validate selected nodes.
+   *
+   * @return the test metapath expression to use
+   */
   @NonNull
-  MetapathExpression getTest();
+  String getTest();
 
   /**
    * A message to emit when the constraint is violated. Allows embedded Metapath
-   * expressions using the syntax {@code \{metapath\}}.
+   * expressions using the syntax {@code \{ metapath \}}.
    *
    * @return the message if defined or {@code null} otherwise
    */
   String getMessage();
 
-  CharSequence generateMessage(@NonNull INodeItem item, @NonNull DynamicContext context);
+  /**
+   * Generate a violation message using the provide item and dynamic context for
+   * inline Metapath value insertion.
+   *
+   * @param item
+   *          the target Metapath item to use as the focus for Metapath evaluation
+   * @param context
+   *          the dynamic context for Metapath evaluation
+   * @return the message
+   */
+  String generateMessage(@NonNull INodeItem item, @NonNull DynamicContext context);
 
   @Override
   default <T, R> R accept(IConstraintVisitor<T, R> visitor, T state) {
     return visitor.visitExpectConstraint(this, state);
   }
 
+  /**
+   * Create a new constraint builder.
+   *
+   * @return the builder
+   */
   @NonNull
   static Builder builder() {
     return new Builder();
@@ -67,19 +85,34 @@ static Builder builder() {
 
   final class Builder
       extends AbstractConstraintBuilder<Builder, IExpectConstraint> {
-    private MetapathExpression test;
+    private String test;
     private String message;
 
     private Builder() {
       // disable construction
     }
 
+    /**
+     * Use the provided test to validate selected nodes.
+     *
+     * @param test
+     *          the test metapath expression to use
+     * @return this builder
+     */
     @NonNull
-    public Builder test(@NonNull MetapathExpression test) {
+    public Builder test(@NonNull String test) {
       this.test = test;
       return this;
     }
 
+    /**
+     * A message to emit when the constraint is violated. Allows embedded Metapath
+     * expressions using the syntax {@code \{ metapath \}}.
+     *
+     * @param message
+     *          the message if defined or {@code null} otherwise
+     * @return this builder
+     */
     @NonNull
     public Builder message(@NonNull String message) {
       this.message = message;
@@ -98,11 +131,11 @@ protected void validate() {
       ObjectUtils.requireNonNull(getTest());
     }
 
-    protected MetapathExpression getTest() {
+    private String getTest() {
       return test;
     }
 
-    protected String getMessage() {
+    private String getMessage() {
       return message;
     }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IFeatureValueConstrained.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IFeatureValueConstrained.java
index 0bb19ce12..48e6070b9 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IFeatureValueConstrained.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IFeatureValueConstrained.java
@@ -29,6 +29,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface IFeatureValueConstrained extends IValueConstrained {
@@ -47,7 +49,7 @@ default ILet addLetExpression(ILet let) {
   }
 
   @Override
-  default Map<String, ILet> getLetExpressions() {
+  default Map<QName, ILet> getLetExpressions() {
     return getConstraintSupport().getLetExpressions();
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndex.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndex.java
index 28a00325a..32fd82f78 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndex.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndex.java
@@ -32,6 +32,7 @@
 import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.metapath.MetapathExpression.ResultType;
 import gov.nist.secauto.metaschema.core.metapath.function.library.FnData;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultIndex;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
@@ -182,13 +183,14 @@ private static String buildKeyItem(
       @NonNull INodeItem item,
       @NonNull IKeyField keyField,
       @NonNull DynamicContext dynamicContext) {
-    MetapathExpression keyPath = keyField.getTarget();
+    String keyPath = keyField.getTarget();
+    MetapathExpression keyMetapath = MetapathExpression.compile(keyPath, dynamicContext.getStaticContext());
 
-    INodeItem keyItem;
+    IItem keyItem;
     try {
-      keyItem = keyPath.evaluateAs(item, ResultType.NODE, dynamicContext);
+      keyItem = keyMetapath.evaluateAs(item, ResultType.ITEM, dynamicContext);
     } catch (InvalidTypeMetapathException ex) {
-      throw new MetapathException("Key path did not result in a single node", ex);
+      throw new MetapathException("Key path did not result in a single item", ex);
     }
 
     String keyValue = null;
@@ -197,7 +199,7 @@ private static String buildKeyItem(
       assert keyValue != null;
       Pattern pattern = keyField.getPattern();
       if (pattern != null) {
-        keyValue = applyPattern(keyItem, keyValue, pattern);
+        keyValue = applyPattern(keyMetapath, keyValue, pattern);
       }
     } // empty key
     return keyValue;
@@ -214,19 +216,19 @@ private static String buildKeyItem(
    *          the current key value
    * @return the final key value
    */
-  private static String applyPattern(@NonNull INodeItem keyItem, @NonNull String keyValue,
+  private static String applyPattern(@NonNull MetapathExpression keyMetapath, @NonNull String keyValue,
       @NonNull Pattern pattern) {
     Matcher matcher = pattern.matcher(keyValue);
     if (!matcher.matches()) {
       throw new MetapathException(
           String.format("Key field declares the pattern '%s' which does not match the value '%s' of node '%s'",
-              pattern.pattern(), keyValue, keyItem.getMetapath()));
+              pattern.pattern(), keyValue, keyMetapath));
     }
 
     if (matcher.groupCount() != 1) {
       throw new MetapathException(String.format(
           "The first group was not a match for value '%s' of node '%s' for key field pattern '%s'",
-          keyValue, keyItem.getMetapath(), pattern.pattern()));
+          keyValue, keyMetapath, pattern.pattern()));
     }
     return matcher.group(1);
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexConstraint.java
index c2504572d..050703e2e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexConstraint.java
@@ -54,27 +54,25 @@ default <T, R> R accept(IConstraintVisitor<T, R> visitor, T state) {
   }
 
   /**
-   * Get a new constraint builder.
+   * Create a new constraint builder.
+   *
+   * @param name
+   *          the identifier for the index
    *
    * @return the builder
    */
   @NonNull
-  static Builder builder() {
-    return new Builder();
+  static Builder builder(@NonNull String name) {
+    return new Builder(name);
   }
 
   final class Builder
       extends AbstractKeyConstraintBuilder<Builder, DefaultIndexConstraint> {
-    private String name;
-
-    private Builder() {
-      // disable construction
-    }
-
     @NonNull
-    public Builder name(@NonNull String name) {
+    private final String name;
+
+    private Builder(@NonNull String name) {
       this.name = name;
-      return this;
     }
 
     @Override
@@ -82,14 +80,8 @@ protected Builder getThis() {
       return this;
     }
 
-    @Override
-    protected void validate() {
-      super.validate();
-
-      ObjectUtils.requireNonNull(name);
-    }
-
-    protected String getName() {
+    @NonNull
+    private String getName() {
       return name;
     }
 
@@ -103,7 +95,7 @@ protected DefaultIndexConstraint newInstance() {
           getLevel(),
           getTarget(),
           getProperties(),
-          ObjectUtils.notNull(getName()),
+          getName(),
           getKeyFields(),
           getRemarks());
     }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexHasKeyConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexHasKeyConstraint.java
index 7a6be6f8b..7c2cc17b8 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexHasKeyConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IIndexHasKeyConstraint.java
@@ -37,6 +37,11 @@
  * {@link IIndexConstraint}.
  */
 public interface IIndexHasKeyConstraint extends IKeyConstraint {
+  /**
+   * The name of the index used to verify cross references.
+   *
+   * @return the index name
+   */
   @NonNull
   String getIndexName();
 
@@ -45,23 +50,25 @@ default <T, R> R accept(IConstraintVisitor<T, R> visitor, T state) {
     return visitor.visitIndexHasKeyConstraint(this, state);
   }
 
+  /**
+   * Create a new constraint builder.
+   *
+   * @param useIndex
+   *          the index name
+   * @return the builder
+   */
   @NonNull
-  static Builder builder() {
-    return new Builder();
+  static Builder builder(@NonNull String useIndex) {
+    return new Builder(useIndex);
   }
 
   final class Builder
       extends AbstractKeyConstraintBuilder<Builder, IIndexHasKeyConstraint> {
-    private String indexName;
-
-    private Builder() {
-      // disable construction
-    }
-
     @NonNull
-    public Builder name(@NonNull String name) {
-      this.indexName = name;
-      return this;
+    private final String indexName;
+
+    private Builder(@NonNull String useIndex) {
+      this.indexName = useIndex;
     }
 
     @Override
@@ -69,14 +76,8 @@ protected Builder getThis() {
       return this;
     }
 
-    @Override
-    protected void validate() {
-      super.validate();
-
-      ObjectUtils.requireNonNull(indexName);
-    }
-
-    protected String getIndexName() {
+    @NonNull
+    private String getIndexName() {
       return indexName;
     }
 
@@ -90,7 +91,7 @@ protected IIndexHasKeyConstraint newInstance() {
           getLevel(),
           getTarget(),
           getProperties(),
-          ObjectUtils.notNull(getIndexName()),
+          getIndexName(),
           getKeyFields(),
           getRemarks());
     }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IKeyField.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IKeyField.java
index f00dff177..f2819ee3d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IKeyField.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IKeyField.java
@@ -27,7 +27,6 @@
 package gov.nist.secauto.metaschema.core.model.constraint;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultKeyField;
 
 import java.util.regex.Pattern;
@@ -58,7 +57,7 @@ public interface IKeyField {
   @SuppressWarnings("PMD.ShortMethodName")
   @NonNull
   static IKeyField of(
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @Nullable Pattern pattern,
       @Nullable MarkupMultiline remarks) {
     return new DefaultKeyField(target, pattern, remarks);
@@ -71,7 +70,7 @@ static IKeyField of(
    * @return the Metapath expression identifying the key value target
    */
   @NonNull
-  MetapathExpression getTarget();
+  String getTarget();
 
   /**
    * A pattern to use to retrieve the value. If non-{@code null}, the first
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ILet.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ILet.java
index 5a9acb02e..fd17914e2 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ILet.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ILet.java
@@ -30,6 +30,8 @@
 import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.constraint.impl.DefaultLet;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 @SuppressWarnings("PMD.ShortClassName")
@@ -49,7 +51,7 @@ public interface ILet {
   @SuppressWarnings("PMD.ShortMethodName")
   @NonNull
   static ILet of(
-      @NonNull String name,
+      @NonNull QName name,
       @NonNull String valueExpression,
       @NonNull ISource source) {
     try {
@@ -79,7 +81,7 @@ static ILet of(
   @SuppressWarnings("PMD.ShortMethodName")
   @NonNull
   static ILet of(
-      @NonNull String name,
+      @NonNull QName name,
       @NonNull MetapathExpression valueExpression,
       @NonNull ISource source) {
     return new DefaultLet(name, valueExpression, source);
@@ -91,7 +93,7 @@ static ILet of(
    * @return the name
    */
   @NonNull
-  String getName();
+  QName getName();
 
   /**
    * Get the Metapath expression to use to query the value.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IMatchesConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IMatchesConstraint.java
index d757c26ce..72561a30d 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IMatchesConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IMatchesConstraint.java
@@ -33,14 +33,28 @@
 import java.util.regex.Pattern;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 /**
  * Represents a rule requiring the value of a field or flag to match a pattern
  * and/or conform to an identified data type.
  */
 public interface IMatchesConstraint extends IConstraint {
+  /**
+   * Get the expected pattern.
+   *
+   * @return the expected pattern or {@code null} if there is no expected pattern
+   */
+  @Nullable
   Pattern getPattern();
 
+  /**
+   * Get the expected data type.
+   *
+   * @return the expected data type or {@code null} if there is no expected data
+   *         type
+   */
+  @Nullable
   IDataTypeAdapter<?> getDataType();
 
   @Override
@@ -48,6 +62,11 @@ default <T, R> R accept(IConstraintVisitor<T, R> visitor, T state) {
     return visitor.visitMatchesConstraint(this, state);
   }
 
+  /**
+   * Create a new constraint builder.
+   *
+   * @return the builder
+   */
   @NonNull
   static Builder builder() {
     return new Builder();
@@ -62,15 +81,36 @@ private Builder() {
       // disable construction
     }
 
+    /**
+     * Use the provided pattern to validate associated values.
+     *
+     * @param pattern
+     *          the pattern to use
+     * @return this builder
+     */
     public Builder regex(@NonNull String pattern) {
       return regex(ObjectUtils.notNull(Pattern.compile(pattern)));
     }
 
+    /**
+     * Use the provided pattern to validate associated values.
+     *
+     * @param pattern
+     *          the expected pattern
+     * @return this builder
+     */
     public Builder regex(@NonNull Pattern pattern) {
       this.pattern = pattern;
       return this;
     }
 
+    /**
+     * Use the provided data type to validate associated values.
+     *
+     * @param datatype
+     *          the expected data type
+     * @return this builder
+     */
     public Builder datatype(@NonNull IDataTypeAdapter<?> datatype) {
       this.datatype = datatype;
       return this;
@@ -90,11 +130,11 @@ protected void validate() {
       }
     }
 
-    protected Pattern getPattern() {
+    private Pattern getPattern() {
       return pattern;
     }
 
-    protected IDataTypeAdapter<?> getDatatype() {
+    private IDataTypeAdapter<?> getDatatype() {
       return datatype;
     }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IScopedContraints.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IScopedContraints.java
index f3848427e..88f809b7b 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IScopedContraints.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IScopedContraints.java
@@ -31,13 +31,32 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * Represents a set of target constraints that apply to a given Metaschema
+ * module namespace and short name.
+ */
 public interface IScopedContraints {
+  /**
+   * The Metaschema module namespace the constraints apply to.
+   *
+   * @return the namespace
+   */
   @NonNull
   URI getModuleNamespace();
 
+  /**
+   * The Metaschema module short name the constraints apply to.
+   *
+   * @return the short name
+   */
   @NonNull
   String getModuleShortName();
 
+  /**
+   * The collection of target constraints.
+   *
+   * @return the constraints
+   */
   @NonNull
   List<ITargetedConstraints> getTargetedContraints();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ISource.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ISource.java
index 631db147f..38fffe004 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ISource.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ISource.java
@@ -26,9 +26,9 @@
 
 package gov.nist.secauto.metaschema.core.model.constraint;
 
-import gov.nist.secauto.metaschema.core.model.constraint.impl.ExternalModelSource;
 import gov.nist.secauto.metaschema.core.model.constraint.impl.ExternalSource;
 import gov.nist.secauto.metaschema.core.model.constraint.impl.InternalModelSource;
+import gov.nist.secauto.metaschema.core.model.constraint.impl.UnknownInternalModelSource;
 
 import java.net.URI;
 
@@ -59,7 +59,7 @@ enum SourceType {
    */
   @NonNull
   static ISource modelSource() {
-    return InternalModelSource.singleton();
+    return UnknownInternalModelSource.instance();
   }
 
   /**
@@ -74,7 +74,7 @@ static ISource modelSource() {
    */
   @NonNull
   static ISource modelSource(@Nullable URI location) {
-    return location == null ? modelSource() : ExternalModelSource.instance(location);
+    return location == null ? modelSource() : InternalModelSource.instance(location);
   }
 
   /**
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ITargetedConstraints.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ITargetedConstraints.java
index b6adabed6..8e3924e35 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ITargetedConstraints.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ITargetedConstraints.java
@@ -26,7 +26,6 @@
 
 package gov.nist.secauto.metaschema.core.model.constraint;
 
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
@@ -38,12 +37,35 @@
  * Metapath expression.
  */
 public interface ITargetedConstraints extends IValueConstrained {
+  /**
+   * Get the Metapath expression used to identify the target of the constraint.
+   *
+   * @return the uncompiled Metapath expression
+   */
   @NonNull
-  MetapathExpression getTargetExpression();
+  String getTargetExpression();
 
+  /**
+   * Apply the constraint to the provided definition.
+   *
+   * @param definition
+   *          the definition to apply the constraint to
+   */
   void target(@NonNull IFlagDefinition definition);
 
+  /**
+   * Apply the constraint to the provided definition.
+   *
+   * @param definition
+   *          the definition to apply the constraint to
+   */
   void target(@NonNull IFieldDefinition definition);
 
+  /**
+   * Apply the constraint to the provided definition.
+   *
+   * @param definition
+   *          the definition to apply the constraint to
+   */
   void target(@NonNull IAssemblyDefinition definition);
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IUniqueConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IUniqueConstraint.java
index 8bb93182c..b441441eb 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IUniqueConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IUniqueConstraint.java
@@ -45,6 +45,11 @@ default <T, R> R accept(IConstraintVisitor<T, R> visitor, T state) {
     return visitor.visitUniqueConstraint(this, state);
   }
 
+  /**
+   * Create a new constraint builder.
+   *
+   * @return the builder
+   */
   @NonNull
   static Builder builder() {
     return new Builder();
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IValueConstrained.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IValueConstrained.java
index e87a00aca..5c3da5fea 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IValueConstrained.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/IValueConstrained.java
@@ -29,6 +29,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -42,7 +44,7 @@ public interface IValueConstrained extends IConstrained {
    * @return the constraints or an empty list
    */
   @NonNull
-  Map<String, ILet> getLetExpressions();
+  Map<QName, ILet> getLetExpressions();
 
   /**
    * Get the collection of allowed value constraints, if any.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java
index 990bb48cb..f8206e672 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.core.model.constraint;
 
+import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
 import gov.nist.secauto.metaschema.core.metapath.MetapathException;
@@ -39,6 +40,7 @@
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -180,10 +182,11 @@ public void handleMatchPatternViolation(
       @NonNull IMatchesConstraint constraint,
       @NonNull INodeItem node,
       @NonNull INodeItem target,
-      @NonNull String value) {
+      @NonNull String value,
+      @NonNull Pattern pattern) {
     Level level = constraint.getLevel();
     if (isLogged(level)) {
-      logConstraint(level, target, newMatchPatternViolationMessage(constraint, node, target, value), null);
+      logConstraint(level, target, newMatchPatternViolationMessage(constraint, node, target, value, pattern), null);
     }
   }
 
@@ -193,10 +196,11 @@ public void handleMatchDatatypeViolation(
       @NonNull INodeItem node,
       @NonNull INodeItem target,
       @NonNull String value,
+      @NonNull IDataTypeAdapter<?> adapter,
       @NonNull IllegalArgumentException cause) {
     Level level = constraint.getLevel();
     if (isLogged(level)) {
-      logConstraint(level, target, newMatchDatatypeViolationMessage(constraint, node, target, value), cause);
+      logConstraint(level, target, newMatchDatatypeViolationMessage(constraint, node, target, value, adapter), cause);
     }
   }
 
@@ -242,12 +246,16 @@ public void handleIndexMiss(IIndexHasKeyConstraint constraint, INodeItem node, I
   }
 
   @Override
-  public void handleGenericValidationViolation(IConstraint constraint, INodeItem node, INodeItem target,
+  public void handleMissingIndexViolation(IIndexHasKeyConstraint constraint, INodeItem node, INodeItem target,
       String message) {
     Level level = constraint.getLevel();
     if (isLogged(level)) {
-      logConstraint(level, node, newGenericValidationViolationMessage(constraint, node, target, message), null);
+      logConstraint(level, node, newMissingIndexViolationMessage(constraint, node, target, message), null);
     }
   }
 
+  @Override
+  public void handlePass(IConstraint constraint, INodeItem node, INodeItem target) {
+    // do nothing
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedModelInstanceGrouped.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValidationFeature.java
similarity index 74%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedModelInstanceGrouped.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValidationFeature.java
index bc526b861..929cc6938 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/AbstractNamedModelInstanceGrouped.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValidationFeature.java
@@ -24,26 +24,25 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.model;
+package gov.nist.secauto.metaschema.core.model.constraint;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
+import gov.nist.secauto.metaschema.core.configuration.AbstractConfigurationFeature;
 
-public abstract class AbstractNamedModelInstanceGrouped implements INamedModelInstanceGrouped {
-  @NonNull
-  private final IChoiceGroupInstance parent;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
+@SuppressWarnings("PMD.DataClass") // not a data class
+public final class ValidationFeature<V>
+    extends AbstractConfigurationFeature<V> {
   /**
-   * Construct a new named model instance that is part of a choice group.
-   *
-   * @param parent
-   *          the containing choice group
+   * If enabled, generate findings for passing constraints.
    */
-  protected AbstractNamedModelInstanceGrouped(@NonNull IChoiceGroupInstance parent) {
-    this.parent = parent;
-  }
+  @NonNull
+  public static final ValidationFeature<Boolean> VALIDATE_GENERATE_PASS_FINDINGS
+      = new ValidationFeature<>(Boolean.class, false);
 
-  @Override
-  public IChoiceGroupInstance getParentContainer() {
-    return parent;
+  private ValidationFeature(
+      @NonNull Class<V> valueClass,
+      @NonNull V defaultValue) {
+    super(valueClass, defaultValue);
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValueConstraintSet.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValueConstraintSet.java
index 2371598cf..cfc7af70c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValueConstraintSet.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/ValueConstraintSet.java
@@ -31,12 +31,14 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class ValueConstraintSet implements IValueConstrained { // NOPMD - intentional
   @SuppressWarnings("PMD.UseConcurrentHashMap") // need ordering
   @NonNull
-  private final Map<String, ILet> lets = new LinkedHashMap<>();
+  private final Map<QName, ILet> lets = new LinkedHashMap<>();
   @NonNull
   private final List<IConstraint> constraints = new LinkedList<>();
   @NonNull
@@ -49,7 +51,7 @@ public class ValueConstraintSet implements IValueConstrained { // NOPMD - intent
   private final List<IExpectConstraint> expectConstraints = new LinkedList<>();
 
   @Override
-  public Map<String, ILet> getLetExpressions() {
+  public Map<QName, ILet> getLetExpressions() {
     return lets;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConstraint.java
index 5f510d60d..38444969c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractConstraint.java
@@ -28,7 +28,6 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
@@ -54,7 +53,7 @@ public abstract class AbstractConstraint implements IConstraint { // NOPMD - int
   @NonNull
   private final Level level;
   @NonNull
-  private final MetapathExpression target;
+  private final String target;
   @Nullable
   private final MarkupMultiline remarks;
   @NonNull
@@ -87,7 +86,7 @@ protected AbstractConstraint(
       @Nullable MarkupLine description,
       @NonNull ISource source,
       @NonNull Level level,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull Map<IAttributable.Key, Set<String>> properties,
       @Nullable MarkupMultiline remarks) {
     Objects.requireNonNull(target);
@@ -128,7 +127,7 @@ public Level getLevel() {
   }
 
   @Override
-  public MetapathExpression getTarget() {
+  public String getTarget() {
     return target;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractDefinitionTargetedConstraints.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractDefinitionTargetedConstraints.java
index 4755aff5e..b38f5a36c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractDefinitionTargetedConstraints.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractDefinitionTargetedConstraints.java
@@ -26,7 +26,6 @@
 
 package gov.nist.secauto.metaschema.core.model.constraint.impl;
 
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IDefinition;
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
@@ -62,7 +61,7 @@ public abstract class AbstractDefinitionTargetedConstraints<
    *          the constraints to apply to matching targets
    */
   protected AbstractDefinitionTargetedConstraints(
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull S constraints) {
     super(target, constraints);
   }
@@ -76,12 +75,11 @@ protected AbstractDefinitionTargetedConstraints(
    * @param definition
    *          the definition to apply the constraints to.
    */
-  @SuppressWarnings("null")
   protected void applyTo(@NonNull T definition) {
-    getAllowedValuesConstraints().forEach(constraint -> definition.addConstraint(constraint));
-    getMatchesConstraints().forEach(constraint -> definition.addConstraint(constraint));
-    getIndexHasKeyConstraints().forEach(constraint -> definition.addConstraint(constraint));
-    getExpectConstraints().forEach(constraint -> definition.addConstraint(constraint));
+    getAllowedValuesConstraints().forEach(definition::addConstraint);
+    getMatchesConstraints().forEach(definition::addConstraint);
+    getIndexHasKeyConstraints().forEach(definition::addConstraint);
+    getExpectConstraints().forEach(definition::addConstraint);
   }
 
   @Override
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java
index 750434bcf..823f92250 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java
@@ -28,7 +28,6 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.constraint.IKeyConstraint;
 import gov.nist.secauto.metaschema.core.model.constraint.IKeyField;
@@ -40,8 +39,9 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-public abstract class AbstractKeyConstraint
+abstract class AbstractKeyConstraint
     extends AbstractConstraint
     implements IKeyConstraint {
   @NonNull
@@ -71,13 +71,14 @@ public abstract class AbstractKeyConstraint
    * @param remarks
    *          optional remarks describing the intent of the constraint
    */
+  @SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
   protected AbstractKeyConstraint(
       @Nullable String id,
       @Nullable String formalName,
       @Nullable MarkupLine description,
       @NonNull ISource source,
       @NonNull Level level,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull Map<IAttributable.Key, Set<String>> properties,
       @NonNull List<IKeyField> keyFields,
       @Nullable MarkupMultiline remarks) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java
index 700711159..fbde439b3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java
@@ -28,7 +28,6 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue;
@@ -91,7 +90,7 @@ public DefaultAllowedValuesConstraint( // NOPMD necessary
       @Nullable MarkupLine description,
       @NonNull ISource source,
       @NonNull Level level,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull Map<IAttributable.Key, Set<String>> properties,
       @NonNull Map<String, IAllowedValue> allowedValues,
       boolean allowedOther,
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java
index 5344678f8..eb2450e78 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java
@@ -28,7 +28,6 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.constraint.ICardinalityConstraint;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
@@ -83,7 +82,7 @@ public DefaultCardinalityConstraint(
       @Nullable MarkupLine description,
       @NonNull ISource source,
       @NonNull Level level,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull Map<IAttributable.Key, Set<String>> properties,
       @Nullable Integer minOccurs,
       @Nullable Integer maxOccurs,
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java
index 345ae7ad8..1769c4e0a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java
@@ -53,7 +53,7 @@ public final class DefaultExpectConstraint
   private static final Pattern METAPATH_VALUE_TEMPLATE_PATTERN
       = Pattern.compile("(?<!\\\\)(\\{\\s*((?:(?:\\\\})|[^}])*)\\s*\\})");
   @NonNull
-  private final MetapathExpression test;
+  private final String test;
   private final String message;
 
   /**
@@ -90,18 +90,18 @@ public DefaultExpectConstraint(
       @Nullable MarkupLine description,
       @NonNull ISource source,
       @NonNull Level level,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull Map<IAttributable.Key, Set<String>> properties,
-      @NonNull MetapathExpression test,
+      @NonNull String test,
       @Nullable String message,
-      MarkupMultiline remarks) {
+      @Nullable MarkupMultiline remarks) {
     super(id, formalName, description, source, level, target, properties, remarks);
     this.test = Objects.requireNonNull(test);
     this.message = message;
   }
 
   @Override
-  public MetapathExpression getTest() {
+  public String getTest() {
     return test;
   }
 
@@ -111,7 +111,7 @@ public String getMessage() {
   }
 
   @Override
-  public CharSequence generateMessage(@NonNull INodeItem item, @NonNull DynamicContext context) {
+  public String generateMessage(@NonNull INodeItem item, @NonNull DynamicContext context) {
     String message = getMessage();
 
     return message == null ? null
@@ -120,6 +120,6 @@ public CharSequence generateMessage(@NonNull INodeItem item, @NonNull DynamicCon
           @NonNull String metapath = match.group(2);
           MetapathExpression expr = MetapathExpression.compile(metapath);
           return expr.evaluateAs(item, MetapathExpression.ResultType.STRING, context);
-        });
+        }).toString();
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java
index 2dc16ce3c..ae2a4c79a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java
@@ -28,7 +28,6 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.constraint.IIndexConstraint;
 import gov.nist.secauto.metaschema.core.model.constraint.IKeyField;
@@ -40,6 +39,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public final class DefaultIndexConstraint
     extends AbstractKeyConstraint
@@ -73,13 +73,14 @@ public final class DefaultIndexConstraint
    *          optional remarks describing the intent of the constraint
    */
   @SuppressWarnings("PMD.ExcessiveParameterList")
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public DefaultIndexConstraint(
       @Nullable String id,
       @Nullable String formalName,
       @Nullable MarkupLine description,
       @NonNull ISource source,
       @NonNull Level level,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull Map<IAttributable.Key, Set<String>> properties,
       @NonNull String name,
       @NonNull List<IKeyField> keyFields,
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java
index 54a4e95ed..a6e431332 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java
@@ -28,7 +28,6 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.constraint.IIndexHasKeyConstraint;
 import gov.nist.secauto.metaschema.core.model.constraint.IKeyField;
@@ -80,7 +79,7 @@ public DefaultIndexHasKeyConstraint(
       @Nullable MarkupLine description,
       @NonNull ISource source,
       @NonNull Level level,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull Map<IAttributable.Key, Set<String>> properties,
       @NonNull String indexName,
       @NonNull List<IKeyField> keyFields,
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultKeyField.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultKeyField.java
index 13119a4bc..fb06db56c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultKeyField.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultKeyField.java
@@ -27,7 +27,6 @@
 package gov.nist.secauto.metaschema.core.model.constraint.impl;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.constraint.IKeyField;
 
 import java.util.regex.Pattern;
@@ -40,7 +39,7 @@ public class DefaultKeyField implements IKeyField {
   @Nullable
   private final Pattern pattern;
   @NonNull
-  private final MetapathExpression target;
+  private final String target;
   @Nullable
   private final MarkupMultiline remarks;
 
@@ -56,7 +55,7 @@ public class DefaultKeyField implements IKeyField {
    *          optional remarks describing the intent of the constraint
    */
   public DefaultKeyField(
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @Nullable Pattern pattern,
       @Nullable MarkupMultiline remarks) {
     this.pattern = pattern;
@@ -70,7 +69,7 @@ public Pattern getPattern() {
   }
 
   @Override
-  public MetapathExpression getTarget() {
+  public String getTarget() {
     return target;
   }
 
@@ -78,5 +77,4 @@ public MetapathExpression getTarget() {
   public MarkupMultiline getRemarks() {
     return remarks;
   }
-
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultLet.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultLet.java
index ae5ca2507..cf30465e1 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultLet.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultLet.java
@@ -30,11 +30,13 @@
 import gov.nist.secauto.metaschema.core.model.constraint.ILet;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class DefaultLet implements ILet {
   @NonNull
-  private final String name;
+  private final QName name;
   @NonNull
   private final MetapathExpression valueExpression;
   @NonNull
@@ -51,7 +53,7 @@ public class DefaultLet implements ILet {
    *          the source of the let statement
    */
   public DefaultLet(
-      @NonNull String name,
+      @NonNull QName name,
       @NonNull MetapathExpression metapath,
       @NonNull ISource source) {
     this.name = name;
@@ -60,7 +62,7 @@ public DefaultLet(
   }
 
   @Override
-  public String getName() {
+  public QName getName() {
     return name;
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java
index ff078ef84..8d832b4dc 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java
@@ -29,7 +29,6 @@
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.constraint.IMatchesConstraint;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
@@ -82,7 +81,7 @@ public DefaultMatchesConstraint(
       @Nullable MarkupLine description,
       @NonNull ISource source,
       @NonNull Level level,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull Map<IAttributable.Key, Set<String>> properties,
       @Nullable Pattern pattern,
       @Nullable IDataTypeAdapter<?> dataType,
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java
index 465194d4f..51e1aa44e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java
@@ -28,7 +28,6 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.constraint.IKeyField;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
@@ -75,7 +74,7 @@ public DefaultUniqueConstraint(
       @Nullable MarkupLine description,
       @NonNull ISource source,
       @NonNull Level level,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull Map<IAttributable.Key, Set<String>> properties,
       @NonNull List<IKeyField> keyFields,
       @Nullable MarkupMultiline remarks) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/ExternalSource.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/ExternalSource.java
index 80bd54ef2..b46b67f69 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/ExternalSource.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/ExternalSource.java
@@ -27,6 +27,7 @@
 package gov.nist.secauto.metaschema.core.model.constraint.impl;
 
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.net.URI;
 import java.util.HashMap;
@@ -58,10 +59,9 @@ public final class ExternalSource implements ISource {
   public static ISource instance(@NonNull URI location) {
     ISource retval;
     synchronized (sources) {
-      retval = sources.get(location);
-      if (retval == null) {
-        retval = new ExternalModelSource(location);
-      }
+      retval = ObjectUtils.notNull(sources.computeIfAbsent(
+          location,
+          (uri) -> new ExternalSource(ObjectUtils.notNull(uri))));
     }
     return retval;
   }
@@ -80,4 +80,9 @@ public SourceType getSourceType() {
   public URI getSource() {
     return modelUri;
   }
+
+  @Override
+  public String toString() {
+    return "external:" + modelUri;
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/InternalModelSource.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/InternalModelSource.java
index 440c6881c..a9642ee29 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/InternalModelSource.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/InternalModelSource.java
@@ -27,8 +27,11 @@
 package gov.nist.secauto.metaschema.core.model.constraint.impl;
 
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -39,20 +42,32 @@
  */
 public final class InternalModelSource implements ISource {
   @NonNull
-  private static final ISource INSTANCE = new InternalModelSource();
+  private static final Map<URI, InternalModelSource> sources = new HashMap<>(); // NOPMD - intentional
+  @NonNull
+  private final URI modelUri;
 
   /**
-   * Get a new instance of a model source that is not associated with a resource.
+   * Get a new instance of an external source associated with a resource
+   * {@code location}.
    *
+   * @param location
+   *          the resource location containing a constraint
    * @return the source
    */
   @NonNull
-  public static ISource singleton() {
-    return INSTANCE;
+  public static ISource instance(@NonNull URI location) {
+    ISource retval;
+    synchronized (sources) {
+      retval = ObjectUtils.notNull(sources.computeIfAbsent(
+          location,
+          (uri) -> new InternalModelSource(ObjectUtils.notNull(uri))));
+    }
+    return retval;
   }
 
-  private InternalModelSource() {
+  private InternalModelSource(@NonNull URI modelSource) {
     // reduce visibility
+    this.modelUri = modelSource;
   }
 
   @Override
@@ -62,7 +77,11 @@ public SourceType getSourceType() {
 
   @Override
   public URI getSource() {
-    // always null
-    return null;
+    return modelUri;
+  }
+
+  @Override
+  public String toString() {
+    return "internal:" + modelUri;
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/ExternalModelSource.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/UnknownInternalModelSource.java
similarity index 75%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/ExternalModelSource.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/UnknownInternalModelSource.java
index c95e3c05b..b7c503bde 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/ExternalModelSource.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/constraint/impl/UnknownInternalModelSource.java
@@ -29,44 +29,33 @@
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 
 import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
  * Implements a
  * {@link gov.nist.secauto.metaschema.core.model.constraint.ISource.SourceType#MODEL}
- * source with an associated resource.
+ * source with no associated resource.
  */
-public final class ExternalModelSource implements ISource {
+public final class UnknownInternalModelSource implements ISource {
   @NonNull
-  private static final Map<URI, ExternalModelSource> sources = new HashMap<>(); // NOPMD - intentional
-  @NonNull
-  private final URI modelUri;
+  private static final ISource INSTANCE = new UnknownInternalModelSource();
 
   /**
-   * Get a new instance of a model source associated with a resource
-   * {@code location}.
+   * Get a new instance of an internal source associated without a resource
+   * location.
    *
    * @param location
    *          the resource location containing a constraint
    * @return the source
    */
   @NonNull
-  public static ISource instance(@NonNull URI location) {
-    ISource retval;
-    synchronized (sources) {
-      retval = sources.get(location);
-      if (retval == null) {
-        retval = new ExternalModelSource(location);
-      }
-    }
-    return retval;
+  public static ISource instance() {
+    return INSTANCE;
   }
 
-  ExternalModelSource(@NonNull URI modelSource) {
-    this.modelUri = modelSource;
+  private UnknownInternalModelSource() {
+    // reduce visibility
   }
 
   @Override
@@ -74,9 +63,14 @@ public SourceType getSourceType() {
     return SourceType.MODEL;
   }
 
-  @NonNull
   @Override
   public URI getSource() {
-    return modelUri;
+    // always null
+    return null;
+  }
+
+  @Override
+  public String toString() {
+    return "internal";
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultContainerFlagSupport.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerFlagSupport.java
similarity index 92%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultContainerFlagSupport.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerFlagSupport.java
index 9b44bd5bb..4a70a2d45 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultContainerFlagSupport.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/DefaultContainerFlagSupport.java
@@ -24,19 +24,21 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.model.xml.impl;
+package gov.nist.secauto.metaschema.core.model.impl;
 
 import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
 public class DefaultContainerFlagSupport<FI extends IFlagInstance> implements IContainerFlagSupport<FI> {
   @NonNull
-  private final Map<String, FI> instances;
+  private final Map<QName, FI> instances;
   @Nullable
   private final FI jsonKey;
 
@@ -50,14 +52,14 @@ public class DefaultContainerFlagSupport<FI extends IFlagInstance> implements IC
    *          configured
    */
   public DefaultContainerFlagSupport(
-      @NonNull Map<String, FI> instances,
+      @NonNull Map<QName, FI> instances,
       @Nullable FI jsonKey) {
     this.instances = instances;
     this.jsonKey = jsonKey;
   }
 
   @Override
-  public Map<String, FI> getFlagInstanceMap() {
+  public Map<QName, FI> getFlagInstanceMap() {
     return instances;
   }
 
@@ -68,6 +70,7 @@ public Map<String, FI> getFlagInstanceMap() {
    * @return the flag instance if a JSON key is configured, or {@code null}
    *         otherwise
    */
+  @Override
   public FI getJsonKeyFlagInstance() {
     return jsonKey;
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/EmptyFlagContainer.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/EmptyFlagContainer.java
similarity index 89%
rename from core/src/main/java/gov/nist/secauto/metaschema/core/model/EmptyFlagContainer.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/EmptyFlagContainer.java
index f69edb93c..d66a8e722 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/EmptyFlagContainer.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/impl/EmptyFlagContainer.java
@@ -59,20 +59,30 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.core.model;
+package gov.nist.secauto.metaschema.core.model.impl;
 
+import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
+import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-class EmptyFlagContainer<FI extends IFlagInstance> implements IContainerFlagSupport<FI> {
+public class EmptyFlagContainer<FI extends IFlagInstance> implements IContainerFlagSupport<FI> {
   @NonNull
   public static final EmptyFlagContainer<?> EMPTY = new EmptyFlagContainer<>();
 
   @Override
-  public Map<String, FI> getFlagInstanceMap() {
+  public Map<QName, FI> getFlagInstanceMap() {
     return CollectionUtil.emptyMap();
   }
+
+  @Override
+  public FI getJsonKeyFlagInstance() {
+    // no JSON key
+    return null;
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/JsonUtil.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/JsonUtil.java
index e25f62720..6bf189915 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/JsonUtil.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/JsonUtil.java
@@ -55,11 +55,25 @@ private JsonUtil() {
     // disable construction
   }
 
+  /**
+   * Parse the input stream into a JSON object.
+   *
+   * @param is
+   *          the input stream to parse
+   * @return the JSON object
+   */
   @NonNull
-  public static JSONObject toJsonObject(@NonNull InputStream schemaInputStream) {
-    return new JSONObject(new JSONTokener(schemaInputStream));
+  public static JSONObject toJsonObject(@NonNull InputStream is) {
+    return new JSONObject(new JSONTokener(is));
   }
 
+  /**
+   * Parse the reader into a JSON object.
+   *
+   * @param reader
+   *          the reader to parse
+   * @return the JSON object
+   */
   @NonNull
   public static JSONObject toJsonObject(@NonNull Reader reader) {
     return new JSONObject(new JSONTokener(reader));
@@ -104,8 +118,19 @@ public static String toString(@NonNull JsonLocation location) {
         .toString();
   }
 
+  /**
+   * Advance the parser to the next location matching the provided token.
+   *
+   * @param parser
+   *          the JSON parser
+   * @param token
+   *          the expected token
+   * @return the current token or {@code null} if no tokens remain in the stream
+   * @throws IOException
+   *           if an error occurred while parsing the JSON
+   */
   @Nullable
-  public static JsonToken advanceTo(@NonNull JsonParser parser, JsonToken token) throws IOException {
+  public static JsonToken advanceTo(@NonNull JsonParser parser, @NonNull JsonToken token) throws IOException {
     JsonToken currentToken = null;
     while (parser.hasCurrentToken() && !token.equals(currentToken = parser.currentToken())) {
       currentToken = parser.nextToken();
@@ -118,6 +143,15 @@ public static JsonToken advanceTo(@NonNull JsonParser parser, JsonToken token) t
     return currentToken;
   }
 
+  /**
+   * Skip the next JSON value in the stream.
+   *
+   * @param parser
+   *          the JSON parser
+   * @return the current token or {@code null} if no tokens remain in the stream
+   * @throws IOException
+   *           if an error occurred while parsing the JSON
+   */
   @SuppressWarnings({
       "resource", // parser not owned
       "PMD.CyclomaticComplexity" // acceptable
@@ -156,118 +190,207 @@ public static JsonToken skipNextValue(@NonNull JsonParser parser) throws IOExcep
     // advance past the value
     return parser.nextToken();
   }
+  //
+  // @SuppressWarnings("PMD.CyclomaticComplexity") // acceptable
+  // private static boolean checkEndOfValue(@NonNull JsonParser parser, @NonNull
+  // JsonToken startToken) {
+  // JsonToken currentToken = parser.getCurrentToken();
+  //
+  // boolean retval;
+  // switch (startToken) { // NOPMD - intentional fall through
+  // case START_OBJECT:
+  // retval = JsonToken.END_OBJECT.equals(currentToken);
+  // break;
+  // case START_ARRAY:
+  // retval = JsonToken.END_ARRAY.equals(currentToken);
+  // break;
+  // case VALUE_EMBEDDED_OBJECT:
+  // case VALUE_FALSE:
+  // case VALUE_NULL:
+  // case VALUE_NUMBER_FLOAT:
+  // case VALUE_NUMBER_INT:
+  // case VALUE_STRING:
+  // case VALUE_TRUE:
+  // retval = true;
+  // break;
+  // default:
+  // retval = false;
+  // }
+  // return retval;
+  // }
 
-  @SuppressWarnings("PMD.CyclomaticComplexity") // acceptable
-  public static boolean checkEndOfValue(@NonNull JsonParser parser, @NonNull JsonToken startToken) {
-    JsonToken currentToken = parser.getCurrentToken();
-
-    boolean retval;
-    switch (startToken) { // NOPMD - intentional fall through
-    case START_OBJECT:
-      retval = JsonToken.END_OBJECT.equals(currentToken);
-      break;
-    case START_ARRAY:
-      retval = JsonToken.END_ARRAY.equals(currentToken);
-      break;
-    case VALUE_EMBEDDED_OBJECT:
-    case VALUE_FALSE:
-    case VALUE_NULL:
-    case VALUE_NUMBER_FLOAT:
-    case VALUE_NUMBER_INT:
-    case VALUE_STRING:
-    case VALUE_TRUE:
-      retval = true;
-      break;
-    default:
-      retval = false;
-    }
-    return retval;
-  }
-
+  /**
+   * Ensure that the current token is one of the provided tokens.
+   * <p>
+   * Note: This uses a Java assertion to support debugging in a whay that doesn't
+   * impact parser performance during production operation.
+   *
+   * @param parser
+   *          the JSON parser
+   * @param expectedTokens
+   *          the tokens for which one is expected to match against the current
+   *          token
+   */
   public static void assertCurrent(
       @NonNull JsonParser parser,
       @NonNull JsonToken... expectedTokens) {
     JsonToken current = parser.currentToken();
     assert Arrays.stream(expectedTokens)
-        .anyMatch(expected -> expected.equals(current)) : getAssertMessage(
+        .anyMatch(expected -> expected.equals(current)) : generateExpectedMessage(
             parser,
             expectedTokens,
             parser.currentToken());
   }
 
-  public static void assertCurrentIsFieldValue(@NonNull JsonParser parser) {
-    JsonToken token = parser.currentToken();
-    assert token.isStructStart() || token.isScalarValue() : String.format(
-        "Expected a START_OBJECT, START_ARRAY, or VALUE_xxx token, but found JsonToken '%s'%s.",
-        token,
-        generateLocationMessage(parser));
-  }
+  // public static void assertCurrentIsFieldValue(@NonNull JsonParser parser) {
+  // JsonToken token = parser.currentToken();
+  // assert token.isStructStart() || token.isScalarValue() : String.format(
+  // "Expected a START_OBJECT, START_ARRAY, or VALUE_xxx token, but found
+  // JsonToken '%s'%s.",
+  // token,
+  // generateLocationMessage(parser));
+  // }
 
+  /**
+   * Ensure that the current token is the one expected and then advance the token
+   * stream.
+   *
+   * @param parser
+   *          the JSON parser
+   * @param expectedToken
+   *          the expected token
+   * @return the next token
+   * @throws IOException
+   *           if an error occurred while reading the token stream
+   */
   @Nullable
   public static JsonToken assertAndAdvance(
       @NonNull JsonParser parser,
       @NonNull JsonToken expectedToken)
       throws IOException {
     JsonToken token = parser.currentToken();
-    assert expectedToken.equals(token) : getAssertMessage(
+    assert expectedToken.equals(token) : generateExpectedMessage(
         parser,
         expectedToken,
         token);
     return parser.nextToken();
   }
 
+  /**
+   * Advance the token stream, then ensure that the current token is the one
+   * expected.
+   *
+   * @param parser
+   *          the JSON parser
+   * @param expectedToken
+   *          the expected token
+   * @return the next token
+   * @throws IOException
+   *           if an error occurred while reading the token stream
+   */
   @Nullable
   public static JsonToken advanceAndAssert(
       @NonNull JsonParser parser,
       @NonNull JsonToken expectedToken)
       throws IOException {
     JsonToken token = parser.nextToken();
-    assert expectedToken.equals(token) : getAssertMessage(
+    assert expectedToken.equals(token) : generateExpectedMessage(
         parser,
         expectedToken,
         token);
     return token;
   }
 
+  /**
+   * Generate a message intended for error reporting based on a presumed token.
+   *
+   * @param parser
+   *          the JSON parser
+   * @param expectedToken
+   *          the expected token
+   * @param actualToken
+   *          the actual token found
+   * @return the message string
+   */
   @NonNull
-  public static String getAssertMessage(
+  private static String generateExpectedMessage(
       @NonNull JsonParser parser,
-      @NonNull JsonToken expected,
-      JsonToken actual) {
+      @NonNull JsonToken expectedToken,
+      JsonToken actualToken) {
     return ObjectUtils.notNull(
         String.format("Expected JsonToken '%s', but found JsonToken '%s'%s.",
-            expected,
-            actual,
+            expectedToken,
+            actualToken,
             generateLocationMessage(parser)));
   }
 
+  /**
+   * Generate a message intended for error reporting based on a presumed set of
+   * tokens.
+   *
+   * @param parser
+   *          the JSON parser
+   * @param expectedTokens
+   *          the set of expected tokens, one of which was expected to match the
+   *          actual token
+   * @param actualToken
+   *          the actual token found
+   * @return the message string
+   */
   @NonNull
-  public static String getAssertMessage(
+  private static String generateExpectedMessage(
       @NonNull JsonParser parser,
-      @NonNull JsonToken[] expected,
-      JsonToken actual) {
-    List<JsonToken> expectedTokens = ObjectUtils.notNull(Arrays.asList(expected));
-    return getAssertMessage(parser, expectedTokens, actual);
+      @NonNull JsonToken[] expectedTokens,
+      JsonToken actualToken) {
+    List<JsonToken> expectedTokensList = ObjectUtils.notNull(Arrays.asList(expectedTokens));
+    return generateExpectedMessage(parser, expectedTokensList, actualToken);
   }
 
+  /**
+   * Generate a message intended for error reporting based on a presumed set of
+   * tokens.
+   *
+   * @param parser
+   *          the JSON parser
+   * @param expectedTokens
+   *          the set of expected tokens, one of which was expected to match the
+   *          actual token
+   * @param actualToken
+   *          the actual token found
+   * @return the message string
+   */
   @NonNull
-  public static String getAssertMessage(
+  private static String generateExpectedMessage(
       @NonNull JsonParser parser,
-      @NonNull Collection<JsonToken> expected,
-      JsonToken actual) {
+      @NonNull Collection<JsonToken> expectedTokens,
+      JsonToken actualToken) {
     return ObjectUtils.notNull(
         String.format("Expected JsonToken(s) '%s', but found JsonToken '%s'%s.",
-            expected.stream().map(token -> token.name()).collect(CustomCollectors.joiningWithOxfordComma("or")),
-            actual,
+            expectedTokens.stream().map(Enum::name).collect(CustomCollectors.joiningWithOxfordComma("or")),
+            actualToken,
             generateLocationMessage(parser)));
   }
 
+  /**
+   * Generate a location string for the current location in the JSON token stream.
+   *
+   * @param parser
+   *          the JSON parser
+   * @return the location string
+   */
   @NonNull
   public static CharSequence generateLocationMessage(@NonNull JsonParser parser) {
     JsonLocation location = parser.getCurrentLocation();
     return location == null ? "" : generateLocationMessage(location);
   }
 
+  /**
+   * Generate a location string for the current location in the JSON token stream.
+   *
+   * @param location
+   *          a JSON token stream location
+   * @return the location string
+   */
   @SuppressWarnings("null")
   @NonNull
   public static CharSequence generateLocationMessage(@NonNull JsonLocation location) {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/XmlEventUtil.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/XmlEventUtil.java
index 14da67e63..1a4e8c370 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/XmlEventUtil.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/util/XmlEventUtil.java
@@ -1,605 +1,670 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.model.util;
-
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import org.codehaus.stax2.XMLEventReader2;
-import org.codehaus.stax2.XMLStreamReader2;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.events.Characters;
-import javax.xml.stream.events.EndElement;
-import javax.xml.stream.events.StartElement;
-import javax.xml.stream.events.XMLEvent;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
-public final class XmlEventUtil { // NOPMD this is a set of utility methods
-  private static final Pattern WHITESPACE_ONLY = Pattern.compile("^\\s+$");
-
-  private static final Map<Integer, String> EVENT_NAME_MAP = new HashMap<>(); // NOPMD - this value is immutable
-
-  static {
-    EVENT_NAME_MAP.put(XMLStreamConstants.START_ELEMENT, "START_ELEMENT");
-    EVENT_NAME_MAP.put(XMLStreamConstants.END_ELEMENT, "END_ELEMENT");
-    EVENT_NAME_MAP.put(XMLStreamConstants.PROCESSING_INSTRUCTION, "PROCESSING_INSTRUCTION");
-    EVENT_NAME_MAP.put(XMLStreamConstants.CHARACTERS, "CHARACTERS");
-    EVENT_NAME_MAP.put(XMLStreamConstants.COMMENT, "COMMENT");
-    EVENT_NAME_MAP.put(XMLStreamConstants.SPACE, "SPACE");
-    EVENT_NAME_MAP.put(XMLStreamConstants.START_DOCUMENT, "START_DOCUMENT");
-    EVENT_NAME_MAP.put(XMLStreamConstants.END_DOCUMENT, "END_DOCUMENT");
-    EVENT_NAME_MAP.put(XMLStreamConstants.ENTITY_REFERENCE, "ENTITY_REFERENCE");
-    EVENT_NAME_MAP.put(XMLStreamConstants.ATTRIBUTE, "ATTRIBUTE");
-    EVENT_NAME_MAP.put(XMLStreamConstants.DTD, "DTD");
-    EVENT_NAME_MAP.put(XMLStreamConstants.CDATA, "CDATA");
-    EVENT_NAME_MAP.put(XMLStreamConstants.NAMESPACE, "XML_NAMESPACE");
-    EVENT_NAME_MAP.put(XMLStreamConstants.NOTATION_DECLARATION, "NOTATION_DECLARATION");
-    EVENT_NAME_MAP.put(XMLStreamConstants.ENTITY_DECLARATION, "ENTITY_DECLARATION");
-  }
-
-  private XmlEventUtil() {
-    // disable construction
-  }
-
-  @SuppressWarnings("null")
-  @NonNull
-  private static Object escape(@NonNull String data) {
-    return data.chars().mapToObj(c -> (char) c).map(c -> escape(c)).collect(Collectors.joining());
-  }
-
-  @SuppressWarnings("null")
-  @NonNull
-  private static String escape(char ch) {
-    String retval;
-    switch (ch) {
-    case '\n':
-      retval = "\\n";
-      break;
-    case '\r':
-      retval = "\\r";
-      break;
-    default:
-      retval = String.valueOf(ch);
-      break;
-    }
-    return retval;
-  }
-
-  /**
-   * Generate a message suitable for logging that describes the provided
-   * {@link XMLEvent}.
-   *
-   * @param xmlEvent
-   *          the event to generate the message for
-   * @return the message
-   */
-  @NonNull
-  public static CharSequence toString(XMLEvent xmlEvent) {
-    CharSequence retval;
-    if (xmlEvent == null) {
-      retval = "EOF";
-    } else {
-      @SuppressWarnings("null")
-      @NonNull StringBuilder builder = new StringBuilder()
-          .append(toEventName(xmlEvent));
-      QName name = toQName(xmlEvent);
-      if (name != null) {
-        builder.append(": ").append(name.toString());
-      }
-      if (xmlEvent.isCharacters()) {
-        String text = xmlEvent.asCharacters().getData();
-        if (text != null) {
-          builder.append(" '").append(escape(text)).append('\'');
-        }
-      }
-      Location location = toLocation(xmlEvent);
-      if (location != null) {
-        builder.append(" at ").append(toString(location));
-      }
-      retval = builder;
-    }
-    return retval;
-  }
-
-  /**
-   * Generates a message for the provided {@link Location}.
-   *
-   * @param location
-   *          the location to generate the message for
-   * @return the message
-   */
-  @SuppressWarnings("null")
-  @NonNull
-  public static CharSequence toString(@Nullable Location location) {
-    return location == null ? "unknown"
-        : new StringBuilder()
-            .append(location.getLineNumber())
-            .append(':')
-            .append(location.getColumnNumber());
-  }
-
-  /**
-   * Generates a string containing the current event and location of the stream
-   * reader.
-   *
-   * @param reader
-   *          the stream reader
-   * @return the generated string
-   */
-  @NonNull
-  public static CharSequence toString(@NonNull XMLStreamReader2 reader) { // NO_UCD (unused code)
-    int type = reader.getEventType();
-
-    @SuppressWarnings("null")
-    @NonNull StringBuilder builder = new StringBuilder().append(toEventName(type));
-    QName name = reader.getName();
-    if (name != null) {
-      builder.append(": ").append(name.toString());
-    }
-    if (XMLStreamConstants.CHARACTERS == type) {
-      String text = reader.getText();
-      if (text != null) {
-        builder.append(" '").append(escape(text)).append('\'');
-      }
-    }
-    Location location = reader.getLocation();
-    if (location != null) {
-      builder.append(" at ").append(toString(location));
-    }
-    return builder;
-  }
-
-  /**
-   * Retrieve the resource location of {@code event}.
-   *
-   * @param event
-   *          the event to identify the location for
-   * @return the location or {@code null} if the location is unknown
-   */
-  @Nullable
-  public static Location toLocation(@NonNull XMLEvent event) {
-    Location retval = null;
-    if (event.isStartElement()) {
-      StartElement start = event.asStartElement();
-      retval = start.getLocation();
-    } else if (event.isEndElement()) {
-      EndElement end = event.asEndElement();
-      retval = end.getLocation();
-    } else if (event.isCharacters()) {
-      Characters characters = event.asCharacters();
-      retval = characters.getLocation();
-    }
-    return retval;
-  }
-
-  /**
-   * Retrieve the name of the node associated with {@code event}.
-   *
-   * @param event
-   *          the event to get the {@link QName} for
-   * @return the name of the node or {@code null} if the event is not a start or
-   *         end element
-   */
-  @Nullable
-  public static QName toQName(@NonNull XMLEvent event) {
-    QName retval = null;
-    if (event.isStartElement()) {
-      StartElement start = event.asStartElement();
-      retval = start.getName();
-    } else if (event.isEndElement()) {
-      EndElement end = event.asEndElement();
-      retval = end.getName();
-    }
-    return retval;
-  }
-
-  /**
-   * Get the event name of the {@code event}.
-   *
-   * @param event
-   *          the event to get the event name for
-   * @return the event name
-   */
-  @NonNull
-  public static String toEventName(@NonNull XMLEvent event) {
-    return toEventName(event.getEventType());
-  }
-
-  /**
-   * Get the event name of the {@code eventType}, which is one of the types
-   * defined by {@link XMLStreamConstants}.
-   *
-   * @param eventType
-   *          the event constant to get the event name for as defined by
-   *          {@link XMLStreamConstants}
-   * @return the event name
-   */
-  @NonNull
-  public static String toEventName(int eventType) {
-    String retval = EVENT_NAME_MAP.get(eventType);
-    if (retval == null) {
-      retval = "unknown event '" + Integer.toString(eventType) + "'";
-    }
-    return retval;
-  }
-
-  /**
-   * Advance through XMLEvents until the event type identified by
-   * {@code eventType} is reached or the end of stream is found.
-   *
-   * @param reader
-   *          the event reader to advance
-   * @param eventType
-   *          the event type to stop on as defined by {@link XMLStreamConstants}
-   * @return the next event of the specified type or {@code null} if the end of
-   *         stream is reached
-   * @throws XMLStreamException
-   *           if an error occurred while advancing the stream
-   */
-  @Nullable
-  public static XMLEvent advanceTo(@NonNull XMLEventReader2 reader, int eventType)
-      throws XMLStreamException { // NO_UCD (unused code)
-    XMLEvent xmlEvent;
-    do {
-      xmlEvent = reader.nextEvent();
-      // if (LOGGER.isWarnEnabled()) {
-      // LOGGER.warn("skipping over: {}", XmlEventUtil.toString(xmlEvent));
-      // }
-      if (xmlEvent.isStartElement()) {
-        advanceTo(reader, XMLStreamConstants.END_ELEMENT);
-        // skip this end element
-        xmlEvent = reader.nextEvent();
-        // if (LOGGER.isDebugEnabled()) {
-        // LOGGER.debug("skipping over: {}", XmlEventUtil.toString(xmlEvent));
-        // }
-      }
-    } while (reader.hasNext() && (xmlEvent = reader.peek()).getEventType() != eventType);
-    return xmlEvent;
-  }
-
-  @SuppressWarnings("PMD.OnlyOneReturn")
-  public static XMLEvent skipElement(@NonNull XMLEventReader2 reader) throws XMLStreamException {
-    XMLEvent xmlEvent = reader.peek();
-    if (!xmlEvent.isStartElement()) {
-      return xmlEvent;
-    }
-    // if (LOGGER.isInfoEnabled()) {
-    // LOGGER.atInfo().log(String.format("At location %s", toString(xmlEvent)));
-    // }
-
-    int depth = 0;
-    do {
-      xmlEvent = reader.nextEvent();
-      // if (LOGGER.isInfoEnabled()) {
-      // LOGGER.atInfo().log(String.format("Skipping %s", toString(xmlEvent)));
-      // }
-      if (xmlEvent.isStartElement()) {
-        depth++;
-      } else if (xmlEvent.isEndElement()) {
-        depth--;
-      }
-    } while (depth > 0 && reader.hasNext());
-    return reader.peek();
-  }
-
-  /**
-   * Skip over any processing instructions.
-   *
-   * @param reader
-   *          the event reader to advance
-   * @return the last processing instruction event or the reader's next event if
-   *         no processing instruction was found
-   * @throws XMLStreamException
-   *           if an error occurred while advancing the stream
-   */
-  @NonNull
-  public static XMLEvent skipProcessingInstructions(@NonNull XMLEventReader2 reader) throws XMLStreamException {
-    XMLEvent nextEvent;
-    while ((nextEvent = reader.peek()).isProcessingInstruction()) {
-      nextEvent = reader.nextEvent();
-    }
-    return nextEvent;
-  }
-
-  /**
-   * Skip over any whitespace.
-   *
-   * @param reader
-   *          the event reader to advance
-   * @return the last character event containing whitespace or the reader's next
-   *         event if no character event was found
-   * @throws XMLStreamException
-   *           if an error occurred while advancing the stream
-   */
-  @SuppressWarnings("null")
-  @NonNull
-  public static XMLEvent skipWhitespace(@NonNull XMLEventReader2 reader) throws XMLStreamException {
-    @NonNull XMLEvent nextEvent;
-    while ((nextEvent = reader.peek()).isCharacters()) {
-      Characters characters = nextEvent.asCharacters();
-      String data = characters.getData();
-      if (WHITESPACE_ONLY.matcher(data).matches()) {
-        nextEvent = reader.nextEvent();
-      } else {
-        break;
-      }
-    }
-    return nextEvent;
-  }
-
-  /**
-   * Determine if the {@code event} is an end element whose name matches the
-   * provided {@code expectedQName}.
-   *
-   * @param event
-   *          the event
-   * @param expectedQName
-   *          the expected element name
-   * @return {@code true} if the next event matches the {@code expectedQName}
-   */
-  public static boolean isEventEndElement(XMLEvent event, @NonNull QName expectedQName) {
-    return event != null
-        && event.isEndElement()
-        && expectedQName.equals(event.asEndElement().getName());
-  }
-
-  /**
-   * Determine if the {@code event} is an end of document event.
-   *
-   * @param event
-   *          the event
-   * @return {@code true} if the next event is an end of document event
-   */
-  public static boolean isEventEndDocument(XMLEvent event) {
-    return event != null
-        && event.isEndElement();
-  }
-
-  /**
-   * Determine if the {@code event} is a start element whose name matches the
-   * provided {@code expectedQName}.
-   *
-   * @param event
-   *          the event
-   * @param expectedQName
-   *          the expected element name
-   * @return {@code true} if the next event is a start element that matches the
-   *         {@code expectedQName}
-   * @throws XMLStreamException
-   *           if an error occurred while looking at the next event
-   */
-  public static boolean isEventStartElement(XMLEvent event, @NonNull QName expectedQName) throws XMLStreamException {
-    return event != null
-        && event.isStartElement()
-        && expectedQName.equals(event.asStartElement().getName());
-  }
-
-  /**
-   * Consume the next event from {@code reader} and assert that this event is of
-   * the type identified by {@code presumedEventType}.
-   *
-   * @param reader
-   *          the event reader
-   * @param presumedEventType
-   *          the expected event type as defined by {@link XMLStreamConstants}
-   * @return the next event
-   * @throws XMLStreamException
-   *           if an error occurred while looking at the next event
-   */
-  public static XMLEvent consumeAndAssert(XMLEventReader2 reader, int presumedEventType)
-      throws XMLStreamException {
-    return consumeAndAssert(reader, presumedEventType, null);
-  }
-
-  /**
-   * Consume the next event from {@code reader} and assert that this event is of
-   * the type identified by {@code presumedEventType} and has the name identified
-   * by {@code presumedName}.
-   *
-   * @param reader
-   *          the event reader
-   * @param presumedEventType
-   *          the expected event type as defined by {@link XMLStreamConstants}
-   * @param presumedName
-   *          the expected name of the node associated with the event
-   * @return the next event
-   * @throws XMLStreamException
-   *           if an error occurred while looking at the next event
-   */
-  public static XMLEvent consumeAndAssert(XMLEventReader2 reader, int presumedEventType, QName presumedName)
-      throws XMLStreamException {
-    XMLEvent retval = reader.nextEvent();
-
-    int eventType = retval.getEventType();
-    QName name = toQName(retval);
-    assert eventType == presumedEventType
-        && (presumedName == null
-            || presumedName.equals(name)) : generateExpectedMessage(
-                retval,
-                presumedEventType,
-                presumedName);
-    return retval;
-  }
-
-  @NonNull
-  public static StartElement requireStartElement(
-      @NonNull XMLEventReader2 reader,
-      @NonNull QName presumedName) throws IOException, XMLStreamException {
-    XMLEvent retval = reader.nextEvent();
-    if (!(retval.isStartElement() && presumedName.equals(retval.asStartElement().getName()))) {
-      throw new IOException(generateExpectedMessage(
-          retval,
-          XMLStreamConstants.START_ELEMENT,
-          presumedName).toString());
-    }
-    return ObjectUtils.notNull(retval.asStartElement());
-  }
-
-  @NonNull
-  public static EndElement requireEndElement(
-      @NonNull XMLEventReader2 reader,
-      @NonNull QName presumedName) throws IOException, XMLStreamException {
-    XMLEvent retval = reader.nextEvent();
-    if (!(retval.isEndElement() && presumedName.equals(retval.asEndElement().getName()))) {
-      throw new IOException(generateExpectedMessage(
-          retval,
-          XMLStreamConstants.END_ELEMENT,
-          presumedName).toString());
-    }
-    return ObjectUtils.notNull(retval.asEndElement());
-  }
-
-  /**
-   * Assert that the next event from {@code reader} is of the type identified by
-   * {@code presumedEventType}.
-   *
-   * @param reader
-   *          the event reader
-   * @param presumedEventType
-   *          the expected event type as defined by {@link XMLStreamConstants}
-   * @return the next event
-   * @throws XMLStreamException
-   *           if an error occurred while looking at the next event
-   * @throws AssertionError
-   *           if the next event does not match the presumed event
-   */
-  public static XMLEvent assertNext(
-      @NonNull XMLEventReader2 reader,
-      int presumedEventType)
-      throws XMLStreamException {
-    return assertNext(reader, presumedEventType, null);
-  }
-
-  /**
-   * Assert that the next event from {@code reader} is of the type identified by
-   * {@code presumedEventType} and has the name identified by
-   * {@code presumedName}.
-   *
-   * @param reader
-   *          the event reader
-   * @param presumedEventType
-   *          the expected event type as defined by {@link XMLStreamConstants}
-   * @param presumedName
-   *          the expected name of the node associated with the event
-   * @return the next event
-   * @throws XMLStreamException
-   *           if an error occurred while looking at the next event
-   * @throws AssertionError
-   *           if the next event does not match the presumed event
-   */
-  public static XMLEvent assertNext(
-      @NonNull XMLEventReader2 reader,
-      int presumedEventType,
-      @Nullable QName presumedName)
-      throws XMLStreamException {
-    XMLEvent nextEvent = reader.peek();
-
-    int eventType = nextEvent.getEventType();
-    assert eventType == presumedEventType
-        && (presumedName == null
-            || presumedName.equals(toQName(nextEvent))) : generateExpectedMessage(
-                nextEvent,
-                presumedEventType,
-                presumedName);
-    return nextEvent;
-  }
-
-  public static CharSequence generateLocationMessage(@NonNull XMLEvent event) {
-    Location location = toLocation(event);
-    return location == null ? "" : generateLocationMessage(location);
-  }
-
-  public static CharSequence generateLocationMessage(@NonNull Location location) {
-    return new StringBuilder(12)
-        .append(" at ")
-        .append(XmlEventUtil.toString(location));
-  }
-
-  public static CharSequence generateExpectedMessage(
-      @Nullable XMLEvent event,
-      int presumedEventType,
-      @Nullable QName presumedName) {
-    StringBuilder builder = new StringBuilder(64);
-    builder
-        .append("Expected XML ")
-        .append(toEventName(presumedEventType));
-
-    if (presumedName != null) {
-      builder.append(" for QName '")
-          .append(presumedName.toString());
-    }
-
-    if (event == null) {
-      builder.append("', instead found null event");
-    } else {
-      builder.append("', instead found ")
-          .append(toString(event))
-          .append(generateLocationMessage(event));
-    }
-    return builder;
-  }
-
-  /**
-   * Skips events specified by {@code events}.
-   *
-   * @param reader
-   *          the event reader
-   * @param events
-   *          the events to skip
-   * @return the next non-mataching event returned by
-   *         {@link XMLEventReader2#peek()}, or {@code null} if there was no next
-   *         event
-   * @throws XMLStreamException
-   *           if an error occurred while reading
-   */
-  public static XMLEvent skipEvents(XMLEventReader2 reader, int... events) throws XMLStreamException {
-    Set<Integer> skipEvents = IntStream.of(events).boxed().collect(Collectors.toSet());
-
-    XMLEvent nextEvent = null;
-    while (reader.hasNext()) {
-      nextEvent = reader.peek();
-      if (!skipEvents.contains(nextEvent.getEventType())) {
-        break;
-      }
-      reader.nextEvent();
-    }
-    return nextEvent;
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model.util;
+
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+
+import org.codehaus.stax2.XMLEventReader2;
+import org.codehaus.stax2.XMLStreamReader2;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.Characters;
+import javax.xml.stream.events.EndElement;
+import javax.xml.stream.events.StartElement;
+import javax.xml.stream.events.XMLEvent;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+public final class XmlEventUtil { // NOPMD this is a set of utility methods
+  private static final Pattern WHITESPACE_ONLY = Pattern.compile("^\\s+$");
+
+  private static final Map<Integer, String> EVENT_NAME_MAP = new HashMap<>(); // NOPMD - this value is immutable
+
+  static {
+    EVENT_NAME_MAP.put(XMLStreamConstants.START_ELEMENT, "START_ELEMENT");
+    EVENT_NAME_MAP.put(XMLStreamConstants.END_ELEMENT, "END_ELEMENT");
+    EVENT_NAME_MAP.put(XMLStreamConstants.PROCESSING_INSTRUCTION, "PROCESSING_INSTRUCTION");
+    EVENT_NAME_MAP.put(XMLStreamConstants.CHARACTERS, "CHARACTERS");
+    EVENT_NAME_MAP.put(XMLStreamConstants.COMMENT, "COMMENT");
+    EVENT_NAME_MAP.put(XMLStreamConstants.SPACE, "SPACE");
+    EVENT_NAME_MAP.put(XMLStreamConstants.START_DOCUMENT, "START_DOCUMENT");
+    EVENT_NAME_MAP.put(XMLStreamConstants.END_DOCUMENT, "END_DOCUMENT");
+    EVENT_NAME_MAP.put(XMLStreamConstants.ENTITY_REFERENCE, "ENTITY_REFERENCE");
+    EVENT_NAME_MAP.put(XMLStreamConstants.ATTRIBUTE, "ATTRIBUTE");
+    EVENT_NAME_MAP.put(XMLStreamConstants.DTD, "DTD");
+    EVENT_NAME_MAP.put(XMLStreamConstants.CDATA, "CDATA");
+    EVENT_NAME_MAP.put(XMLStreamConstants.NAMESPACE, "XML_NAMESPACE");
+    EVENT_NAME_MAP.put(XMLStreamConstants.NOTATION_DECLARATION, "NOTATION_DECLARATION");
+    EVENT_NAME_MAP.put(XMLStreamConstants.ENTITY_DECLARATION, "ENTITY_DECLARATION");
+  }
+
+  private XmlEventUtil() {
+    // disable construction
+  }
+
+  @SuppressWarnings("null")
+  @NonNull
+  private static Object escape(@NonNull String data) {
+    return data.chars()
+        .mapToObj(c -> (char) c)
+        .map(XmlEventUtil::escape).collect(Collectors.joining());
+  }
+
+  @SuppressWarnings("null")
+  @NonNull
+  private static String escape(char ch) {
+    String retval;
+    switch (ch) {
+    case '\n':
+      retval = "\\n";
+      break;
+    case '\r':
+      retval = "\\r";
+      break;
+    default:
+      retval = String.valueOf(ch);
+      break;
+    }
+    return retval;
+  }
+
+  /**
+   * Generate a message suitable for logging that describes the provided
+   * {@link XMLEvent}.
+   *
+   * @param xmlEvent
+   *          the XML event to generate the message for
+   * @return the message
+   */
+  @NonNull
+  public static CharSequence toString(XMLEvent xmlEvent) {
+    CharSequence retval;
+    if (xmlEvent == null) {
+      retval = "EOF";
+    } else {
+      @SuppressWarnings("null")
+      @NonNull StringBuilder builder = new StringBuilder()
+          .append(toEventName(xmlEvent));
+      QName name = toQName(xmlEvent);
+      if (name != null) {
+        builder.append(": ").append(name.toString());
+      }
+      if (xmlEvent.isCharacters()) {
+        String text = xmlEvent.asCharacters().getData();
+        if (text != null) {
+          builder.append(" '").append(escape(text)).append('\'');
+        }
+      }
+      Location location = toLocation(xmlEvent);
+      if (location != null) {
+        builder.append(" at ").append(toString(location));
+      }
+      retval = builder;
+    }
+    return retval;
+  }
+
+  /**
+   * Generates a message for the provided {@link Location}.
+   *
+   * @param location
+   *          the location to generate the message for
+   * @return the message
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static CharSequence toString(@Nullable Location location) {
+    return location == null ? "unknown"
+        : new StringBuilder()
+            .append(location.getLineNumber())
+            .append(':')
+            .append(location.getColumnNumber());
+  }
+
+  /**
+   * Generates a string containing the current event and location of the stream
+   * reader.
+   *
+   * @param reader
+   *          the XML event stream reader
+   * @return the generated string
+   */
+  @NonNull
+  public static CharSequence toString(@NonNull XMLStreamReader2 reader) { // NO_UCD (unused code)
+    int type = reader.getEventType();
+
+    @SuppressWarnings("null")
+    @NonNull StringBuilder builder = new StringBuilder().append(toEventName(type));
+    QName name = reader.getName();
+    if (name != null) {
+      builder.append(": ").append(name.toString());
+    }
+    if (XMLStreamConstants.CHARACTERS == type) {
+      String text = reader.getText();
+      if (text != null) {
+        builder.append(" '").append(escape(text)).append('\'');
+      }
+    }
+    Location location = reader.getLocation();
+    if (location != null) {
+      builder.append(" at ").append(toString(location));
+    }
+    return builder;
+  }
+
+  /**
+   * Retrieve the resource location of {@code event}.
+   *
+   * @param event
+   *          the XML event to identify the location for
+   * @return the location or {@code null} if the location is unknown
+   */
+  @Nullable
+  public static Location toLocation(@NonNull XMLEvent event) {
+    Location retval = null;
+    if (event.isStartElement()) {
+      StartElement start = event.asStartElement();
+      retval = start.getLocation();
+    } else if (event.isEndElement()) {
+      EndElement end = event.asEndElement();
+      retval = end.getLocation();
+    } else if (event.isCharacters()) {
+      Characters characters = event.asCharacters();
+      retval = characters.getLocation();
+    }
+    return retval;
+  }
+
+  /**
+   * Retrieve the name of the node associated with {@code event}.
+   *
+   * @param event
+   *          the XML event to get the {@link QName} for
+   * @return the name of the node or {@code null} if the event is not a start or
+   *         end element
+   */
+  @Nullable
+  public static QName toQName(@NonNull XMLEvent event) {
+    QName retval = null;
+    if (event.isStartElement()) {
+      StartElement start = event.asStartElement();
+      retval = start.getName();
+    } else if (event.isEndElement()) {
+      EndElement end = event.asEndElement();
+      retval = end.getName();
+    }
+    return retval;
+  }
+
+  /**
+   * Get the event name of the {@code event}.
+   *
+   * @param event
+   *          the XML event to get the event name for
+   * @return the event name
+   */
+  @NonNull
+  public static String toEventName(@NonNull XMLEvent event) {
+    return toEventName(event.getEventType());
+  }
+
+  /**
+   * Get the event name of the {@code eventType}, which is one of the types
+   * defined by {@link XMLStreamConstants}.
+   *
+   * @param eventType
+   *          the event constant to get the event name for as defined by
+   *          {@link XMLStreamConstants}
+   * @return the event name
+   */
+  @NonNull
+  public static String toEventName(int eventType) {
+    String retval = EVENT_NAME_MAP.get(eventType);
+    if (retval == null) {
+      retval = "unknown event '" + Integer.toString(eventType) + "'";
+    }
+    return retval;
+  }
+
+  /**
+   * Advance through XMLEvents until the event type identified by
+   * {@code eventType} is reached or the end of stream is found.
+   *
+   * @param reader
+   *          the XML event reader to advance
+   * @param eventType
+   *          the event type to stop on as defined by {@link XMLStreamConstants}
+   * @return the next event of the specified type or {@code null} if the end of
+   *         stream is reached
+   * @throws XMLStreamException
+   *           if an error occurred while advancing the stream
+   */
+  @Nullable
+  public static XMLEvent advanceTo(@NonNull XMLEventReader2 reader, int eventType)
+      throws XMLStreamException { // NO_UCD (unused code)
+    XMLEvent xmlEvent;
+    do {
+      xmlEvent = reader.nextEvent();
+      // if (LOGGER.isWarnEnabled()) {
+      // LOGGER.warn("skipping over: {}", XmlEventUtil.toString(xmlEvent));
+      // }
+      if (xmlEvent.isStartElement()) {
+        advanceTo(reader, XMLStreamConstants.END_ELEMENT);
+        // skip this end element
+        xmlEvent = reader.nextEvent();
+        // if (LOGGER.isDebugEnabled()) {
+        // LOGGER.debug("skipping over: {}", XmlEventUtil.toString(xmlEvent));
+        // }
+      }
+    } while (reader.hasNext() && (xmlEvent = reader.peek()).getEventType() != eventType);
+    return xmlEvent;
+  }
+
+  /**
+   * Skip over the next element in the event stream.
+   *
+   * @param reader
+   *          the XML event stream reader
+   * @return the next XML event
+   * @throws XMLStreamException
+   *           if an error occurred while reading the event stream
+   */
+  @SuppressWarnings("PMD.OnlyOneReturn")
+  public static XMLEvent skipElement(@NonNull XMLEventReader2 reader) throws XMLStreamException {
+    XMLEvent xmlEvent = reader.peek();
+    if (!xmlEvent.isStartElement()) {
+      return xmlEvent;
+    }
+    // if (LOGGER.isInfoEnabled()) {
+    // LOGGER.atInfo().log(String.format("At location %s", toString(xmlEvent)));
+    // }
+
+    int depth = 0;
+    do {
+      xmlEvent = reader.nextEvent();
+      // if (LOGGER.isInfoEnabled()) {
+      // LOGGER.atInfo().log(String.format("Skipping %s", toString(xmlEvent)));
+      // }
+      if (xmlEvent.isStartElement()) {
+        depth++;
+      } else if (xmlEvent.isEndElement()) {
+        depth--;
+      }
+    } while (depth > 0 && reader.hasNext());
+    return reader.peek();
+  }
+
+  /**
+   * Skip over any processing instructions.
+   *
+   * @param reader
+   *          the XML event reader to advance
+   * @return the last processing instruction event or the reader's next event if
+   *         no processing instruction was found
+   * @throws XMLStreamException
+   *           if an error occurred while advancing the stream
+   */
+  @NonNull
+  public static XMLEvent skipProcessingInstructions(@NonNull XMLEventReader2 reader) throws XMLStreamException {
+    XMLEvent nextEvent;
+    while ((nextEvent = reader.peek()).isProcessingInstruction()) {
+      nextEvent = reader.nextEvent();
+    }
+    return nextEvent;
+  }
+
+  /**
+   * Skip over any whitespace.
+   *
+   * @param reader
+   *          the XML event reader to advance
+   * @return the last character event containing whitespace or the reader's next
+   *         event if no character event was found
+   * @throws XMLStreamException
+   *           if an error occurred while advancing the stream
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static XMLEvent skipWhitespace(@NonNull XMLEventReader2 reader) throws XMLStreamException {
+    @NonNull XMLEvent nextEvent;
+    while ((nextEvent = reader.peek()).isCharacters()) {
+      Characters characters = nextEvent.asCharacters();
+      String data = characters.getData();
+      if (WHITESPACE_ONLY.matcher(data).matches()) {
+        nextEvent = reader.nextEvent();
+      } else {
+        break;
+      }
+    }
+    return nextEvent;
+  }
+
+  /**
+   * Determine if the {@code event} is an end element whose name matches the
+   * provided {@code expectedQName}.
+   *
+   * @param event
+   *          the XML event
+   * @param expectedQName
+   *          the expected element name
+   * @return {@code true} if the next event matches the {@code expectedQName}
+   */
+  public static boolean isEventEndElement(XMLEvent event, @NonNull QName expectedQName) {
+    return event != null
+        && event.isEndElement()
+        && expectedQName.equals(event.asEndElement().getName());
+  }
+
+  /**
+   * Determine if the {@code event} is an end of document event.
+   *
+   * @param event
+   *          the XML event
+   * @return {@code true} if the next event is an end of document event
+   */
+  public static boolean isEventEndDocument(XMLEvent event) {
+    return event != null
+        && event.isEndElement();
+  }
+
+  /**
+   * Determine if the {@code event} is a start element whose name matches the
+   * provided {@code expectedQName}.
+   *
+   * @param event
+   *          the event
+   * @param expectedQName
+   *          the expected element name
+   * @return {@code true} if the next event is a start element that matches the
+   *         {@code expectedQName}
+   * @throws XMLStreamException
+   *           if an error occurred while looking at the next event
+   */
+  public static boolean isEventStartElement(XMLEvent event, @NonNull QName expectedQName) throws XMLStreamException {
+    return event != null
+        && event.isStartElement()
+        && expectedQName.equals(event.asStartElement().getName());
+  }
+
+  /**
+   * Consume the next event from {@code reader} and assert that this event is of
+   * the type identified by {@code presumedEventType}.
+   *
+   * @param reader
+   *          the XML event reader
+   * @param presumedEventType
+   *          the expected event type as defined by {@link XMLStreamConstants}
+   * @return the next event
+   * @throws XMLStreamException
+   *           if an error occurred while looking at the next event
+   */
+  public static XMLEvent consumeAndAssert(XMLEventReader2 reader, int presumedEventType)
+      throws XMLStreamException {
+    return consumeAndAssert(reader, presumedEventType, null);
+  }
+
+  /**
+   * Consume the next event from {@code reader} and assert that this event is of
+   * the type identified by {@code presumedEventType} and has the name identified
+   * by {@code presumedName}.
+   *
+   * @param reader
+   *          the XML event reader
+   * @param presumedEventType
+   *          the expected event type as defined by {@link XMLStreamConstants}
+   * @param presumedName
+   *          the expected name of the node associated with the event
+   * @return the next event
+   * @throws XMLStreamException
+   *           if an error occurred while looking at the next event
+   */
+  public static XMLEvent consumeAndAssert(XMLEventReader2 reader, int presumedEventType, QName presumedName)
+      throws XMLStreamException {
+    XMLEvent retval = reader.nextEvent();
+
+    int eventType = retval.getEventType();
+    QName name = toQName(retval);
+    assert eventType == presumedEventType
+        && (presumedName == null
+            || presumedName.equals(name)) : generateExpectedMessage(
+                retval,
+                presumedEventType,
+                presumedName);
+    return retval;
+  }
+
+  /**
+   * Ensure that the next event is an XML start element that matches the presumed
+   * name.
+   *
+   * @param reader
+   *          the XML event reader
+   * @param presumedName
+   *          the qualified name of the expected next event
+   * @return the XML start element event
+   * @throws IOException
+   *           if an error occurred while parsing the resource
+   * @throws XMLStreamException
+   *           if an error occurred while parsing the XML event stream
+   */
+  @NonNull
+  public static StartElement requireStartElement(
+      @NonNull XMLEventReader2 reader,
+      @NonNull QName presumedName) throws IOException, XMLStreamException {
+    XMLEvent retval = reader.nextEvent();
+    if (!(retval.isStartElement() && presumedName.equals(retval.asStartElement().getName()))) {
+      throw new IOException(generateExpectedMessage(
+          retval,
+          XMLStreamConstants.START_ELEMENT,
+          presumedName).toString());
+    }
+    return ObjectUtils.notNull(retval.asStartElement());
+  }
+
+  /**
+   * Ensure that the next event is an XML start element that matches the presumed
+   * name.
+   *
+   * @param reader
+   *          the XML event reader
+   * @param presumedName
+   *          the qualified name of the expected next event
+   * @return the XML start element event
+   * @throws IOException
+   *           if an error occurred while parsing the resource
+   * @throws XMLStreamException
+   *           if an error occurred while parsing the XML event stream
+   */
+  @NonNull
+  public static EndElement requireEndElement(
+      @NonNull XMLEventReader2 reader,
+      @NonNull QName presumedName) throws IOException, XMLStreamException {
+    XMLEvent retval = reader.nextEvent();
+    if (!(retval.isEndElement() && presumedName.equals(retval.asEndElement().getName()))) {
+      throw new IOException(generateExpectedMessage(
+          retval,
+          XMLStreamConstants.END_ELEMENT,
+          presumedName).toString());
+    }
+    return ObjectUtils.notNull(retval.asEndElement());
+  }
+
+  /**
+   * Ensure that the next event from {@code reader} is of the type identified by
+   * {@code presumedEventType}.
+   *
+   * @param reader
+   *          the event reader
+   * @param presumedEventType
+   *          the expected event type as defined by {@link XMLStreamConstants}
+   * @return the next event
+   * @throws XMLStreamException
+   *           if an error occurred while looking at the next event
+   * @throws AssertionError
+   *           if the next event does not match the presumed event
+   */
+  public static XMLEvent assertNext(
+      @NonNull XMLEventReader2 reader,
+      int presumedEventType)
+      throws XMLStreamException {
+    return assertNext(reader, presumedEventType, null);
+  }
+
+  /**
+   * Ensure that the next event from {@code reader} is of the type identified by
+   * {@code presumedEventType} and has the name identified by
+   * {@code presumedName}.
+   *
+   * @param reader
+   *          the event reader
+   * @param presumedEventType
+   *          the expected event type as defined by {@link XMLStreamConstants}
+   * @param presumedName
+   *          the expected name of the node associated with the event
+   * @return the next event
+   * @throws XMLStreamException
+   *           if an error occurred while looking at the next event
+   * @throws AssertionError
+   *           if the next event does not match the presumed event
+   */
+  public static XMLEvent assertNext(
+      @NonNull XMLEventReader2 reader,
+      int presumedEventType,
+      @Nullable QName presumedName)
+      throws XMLStreamException {
+    XMLEvent nextEvent = reader.peek();
+
+    int eventType = nextEvent.getEventType();
+    assert eventType == presumedEventType
+        && (presumedName == null
+            || presumedName.equals(toQName(nextEvent))) : generateExpectedMessage(
+                nextEvent,
+                presumedEventType,
+                presumedName);
+    return nextEvent;
+  }
+
+  /**
+   * Generate a location string for the current location in the XML event stream.
+   *
+   * @param event
+   *          an XML event
+   * @return the location string
+   */
+  public static CharSequence generateLocationMessage(@NonNull XMLEvent event) {
+    Location location = toLocation(event);
+    return location == null ? "" : generateLocationMessage(location);
+  }
+
+  /**
+   * Generate a location string for the current location in the XML event stream.
+   *
+   * @param location
+   *          an XML event stream location
+   * @return the location string
+   */
+  public static CharSequence generateLocationMessage(@NonNull Location location) {
+    return new StringBuilder(12)
+        .append(" at ")
+        .append(XmlEventUtil.toString(location));
+  }
+
+  /**
+   * Generate a message intended for error reporting based on a presumed event.
+   *
+   * @param event
+   *          the current XML event
+   * @param presumedEventType
+   *          the expected event type ({@link XMLEvent#getEventType()})
+   * @param presumedName
+   *          the expected event qualified name or {@code null} if there is no
+   *          expectation
+   * @return the message string
+   */
+  public static CharSequence generateExpectedMessage(
+      @Nullable XMLEvent event,
+      int presumedEventType,
+      @Nullable QName presumedName) {
+    StringBuilder builder = new StringBuilder(64);
+    builder
+        .append("Expected XML ")
+        .append(toEventName(presumedEventType));
+
+    if (presumedName != null) {
+      builder.append(" for QName '")
+          .append(presumedName.toString());
+    }
+
+    if (event == null) {
+      builder.append("', instead found null event");
+    } else {
+      builder.append("', instead found ")
+          .append(toString(event))
+          .append(generateLocationMessage(event));
+    }
+    return builder;
+  }
+
+  /**
+   * Skips events specified by {@code events}.
+   *
+   * @param reader
+   *          the event reader
+   * @param events
+   *          the events to skip
+   * @return the next non-mataching event returned by
+   *         {@link XMLEventReader2#peek()}, or {@code null} if there was no next
+   *         event
+   * @throws XMLStreamException
+   *           if an error occurred while reading
+   */
+  public static XMLEvent skipEvents(XMLEventReader2 reader, int... events) throws XMLStreamException {
+    Set<Integer> skipEvents = IntStream.of(events).boxed().collect(Collectors.toSet());
+
+    XMLEvent nextEvent = null;
+    while (reader.hasNext()) {
+      nextEvent = reader.peek();
+      if (!skipEvents.contains(nextEvent.getEventType())) {
+        break;
+      }
+      reader.nextEvent();
+    }
+    return nextEvent;
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AggregateValidationResult.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AggregateValidationResult.java
index eebd89682..e4711a500 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AggregateValidationResult.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/AggregateValidationResult.java
@@ -37,6 +37,10 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * Provides the means to aggregate multiple validation result sets into a single
+ * result set.
+ */
 public final class AggregateValidationResult implements IValidationResult {
   @NonNull
   private final List<IValidationFinding> findings;
@@ -48,10 +52,13 @@ private AggregateValidationResult(@NonNull List<IValidationFinding> findings, @N
     this.highestSeverity = highestSeverity;
   }
 
-  public static IValidationResult aggregate(@NonNull IValidationResult result) {
-    return result;
-  }
-
+  /**
+   * Aggregate multiple provided results into a single result set.
+   *
+   * @param results
+   *          the results to aggregate
+   * @return the combined results
+   */
   public static IValidationResult aggregate(@NonNull IValidationResult... results) {
     Stream<? extends IValidationFinding> stream = Stream.empty();
     for (IValidationResult result : results) {
@@ -61,7 +68,7 @@ public static IValidationResult aggregate(@NonNull IValidationResult... results)
     return aggregate(stream);
   }
 
-  public static IValidationResult aggregate(@NonNull Stream<? extends IValidationFinding> findingStream) {
+  private static IValidationResult aggregate(@NonNull Stream<? extends IValidationFinding> findingStream) {
     AtomicReference<Level> highestSeverity = new AtomicReference<>(Level.INFORMATIONAL);
 
     List<IValidationFinding> findings = new LinkedList<>();
@@ -85,5 +92,4 @@ public Level getHighestSeverity() {
   public List<? extends IValidationFinding> getFindings() {
     return findings;
   }
-
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IValidationFinding.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IValidationFinding.java
index dc2df351e..88cfeb6cc 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IValidationFinding.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/IValidationFinding.java
@@ -26,17 +26,50 @@
 
 package gov.nist.secauto.metaschema.core.model.validation;
 
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 
 import java.net.URI;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 /**
  * Provides information about an individual finding that is the result of a
  * completed content validation.
  */
 public interface IValidationFinding {
+  /**
+   * The finding type.
+   */
+  enum Kind {
+    /**
+     * The finding does not apply to the intended purpose of the validation.
+     */
+    NOT_APPLICABLE,
+    /**
+     * The finding represents a successful result.
+     */
+    PASS,
+    /**
+     * The finding represents an unsuccessful result.
+     */
+    FAIL,
+    /**
+     * The finding is providing information that does not indicate success or
+     * failure.
+     */
+    INFORMATIONAL;
+  }
+
+  /**
+   * Get the unique identifier for the finding.
+   *
+   * @return the identifier
+   */
+  @Nullable
+  String getIdentifier();
+
   /**
    * Get the finding's severity.
    *
@@ -46,34 +79,52 @@ public interface IValidationFinding {
   IConstraint.Level getSeverity();
 
   /**
-   * Get the document's URI.
+   * Get the finding type.
    *
-   * @return the document's URI
+   * @return the finding type
    */
   @NonNull
+  Kind getKind();
+
+  /**
+   * Get the document's URI.
+   *
+   * @return the document's URI or {@code null} if it is not known
+   */
+  @Nullable
   URI getDocumentUri();
-  //
-  // /**
-  // * Get the line on which the finding occurred.
-  // *
-  // * @return the line number or {@code null} if unknown
-  // */
-  // Integer getLineNumber();
-  //
-  // /**
-  // * Get the line column on which the finding occurred.
-  // *
-  // * @return the column umber or {@code null} if unknown
-  // */
-  // Integer getColumnNumber();
+
+  /**
+   * Get the location in the associated resource associated with the finding.
+   *
+   * @return the location or {@code null} if no location is known
+   */
+  @Nullable
+  IResourceLocation getLocation();
+
+  /**
+   * Get the path expression type provided by the {@link #getPath()} method.
+   *
+   * @return the path type identifier or {@code null} if unknown
+   */
+  @Nullable
+  String getPathKind();
+
+  /**
+   * A format specific path to the finding in the source document.
+   *
+   * @return the path or {@code null} if unknown
+   */
+  @Nullable
+  String getPath();
 
   /**
    * Get the finding message.
    *
-   * @return the message
+   * @return the message or {@code null} if there is no message
    */
-  @NonNull
-  CharSequence getMessage();
+  @Nullable
+  String getMessage();
 
   /**
    * Get the exception associated with the finding.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/JsonSchemaContentValidator.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/JsonSchemaContentValidator.java
index 23b8ee742..325c27709 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/JsonSchemaContentValidator.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/JsonSchemaContentValidator.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.core.model.validation;
 
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -53,74 +54,153 @@ public class JsonSchemaContentValidator
   @NonNull
   private final Schema schema;
 
+  /**
+   * Construct a new JSON schema validator using the provided reader to load the
+   * JSON schema.
+   *
+   * @param reader
+   *          the JSON schema reader
+   */
   public JsonSchemaContentValidator(@NonNull Reader reader) {
     this(new JSONTokener(reader));
   }
 
+  /**
+   * Construct a new JSON schema validator using the provided input stream to load
+   * the JSON schema.
+   *
+   * @param is
+   *          the JSON schema input source
+   */
   public JsonSchemaContentValidator(@NonNull InputStream is) {
     this(new JSONTokener(is));
   }
 
+  /**
+   * Construct a new JSON schema validator using the provided JSON object for the
+   * JSON schema.
+   *
+   * @param jsonSchema
+   *          the JSON schema
+   */
   public JsonSchemaContentValidator(@NonNull JSONObject jsonSchema) {
     this(ObjectUtils.notNull(SchemaLoader.load(jsonSchema)));
   }
 
+  /**
+   * Construct a new JSON schema validator using the provided JSON tokenizer to
+   * load the schema.
+   *
+   * @param tokenizer
+   *          the JSON schema token stream
+   */
   protected JsonSchemaContentValidator(@NonNull JSONTokener tokenizer) {
     this(new JSONObject(tokenizer));
   }
 
+  /**
+   * Construct a new JSON schema validator using the preloaded JSON schema.
+   *
+   * @param schema
+   *          the preloaded JSON schema
+   */
   protected JsonSchemaContentValidator(@NonNull Schema schema) {
     this.schema = ObjectUtils.requireNonNull(schema, "schema");
   }
 
   @Override
-  public IValidationResult validate(InputStream is, URI documentUri) throws IOException {
+  public IValidationResult validate(InputStream is, URI resourceUri) throws IOException {
     JSONObject json;
     try {
       json = new JSONObject(new JSONTokener(is));
     } catch (JSONException ex) {
-      throw new IOException(String.format("Unable to parse JSON from '%s'", documentUri), ex);
+      throw new IOException(String.format("Unable to parse JSON from '%s'", resourceUri), ex);
     }
-    return validate(json, documentUri);
+    return validate(json, resourceUri);
   }
 
+  /**
+   * Validate the provided JSON.
+   *
+   * @param json
+   *          the JSON to validate
+   * @param resourceUri
+   *          the source URI for the JSON to validate
+   * @return the validation results
+   */
   @SuppressWarnings("null")
   @NonNull
-  public IValidationResult validate(@NonNull JSONObject json, @NonNull URI documentUri) {
+  public IValidationResult validate(@NonNull JSONObject json, @NonNull URI resourceUri) {
     IValidationResult retval;
     try {
       schema.validate(json);
       retval = IValidationResult.PASSING_RESULT;
     } catch (ValidationException ex) {
-      retval = new JsonValidationResult(
-          handleValidationException(ex, documentUri)
-              .collect(Collectors.toList()));
+      retval = new JsonValidationResult(handleValidationException(ex, resourceUri).collect(Collectors.toList()));
     }
 
     return retval;
   }
 
+  /**
+   * Build validation findings from a validation exception.
+   *
+   * @param exception
+   *          the JSON schema validation exception generated during schema
+   *          validation representing the issue
+   * @param resourceUri
+   *          the resource the issue was found in
+   * @return the stream of findings
+   */
   @SuppressWarnings("null")
   @NonNull
-  protected Stream<JsonValidationFinding> handleValidationException(@NonNull ValidationException ex,
-      @NonNull URI documentUri) {
-    JsonValidationFinding finding = new JsonValidationFinding(ex, documentUri);
-    Stream<JsonValidationFinding> childFindings = ex.getCausingExceptions().stream()
-        .flatMap(exception -> {
-          return handleValidationException(exception, documentUri);
+  protected Stream<JsonValidationFinding> handleValidationException(
+      @NonNull ValidationException exception,
+      @NonNull URI resourceUri) {
+    JsonValidationFinding finding = new JsonValidationFinding(exception, resourceUri);
+    Stream<JsonValidationFinding> childFindings = exception.getCausingExceptions().stream()
+        .flatMap(ex -> {
+          return handleValidationException(ex, resourceUri);
         });
     return Stream.concat(Stream.of(finding), childFindings);
   }
 
+  /**
+   * Records an identified individual validation result found during JSON schema
+   * validation.
+   */
   public static class JsonValidationFinding implements IValidationFinding {
     @NonNull
     private final ValidationException exception;
     @NonNull
     private final URI documentUri;
 
-    public JsonValidationFinding(@NonNull ValidationException exception, @NonNull URI documentUri) {
+    /**
+     * Construct a new XML schema validation finding, which represents an issue
+     * identified during XML schema validation.
+     *
+     * @param exception
+     *          the JSON schema validation exception generated during schema
+     *          validation representing the issue
+     * @param resourceUri
+     *          the resource the issue was found in
+     */
+    public JsonValidationFinding(
+        @NonNull ValidationException exception,
+        @NonNull URI resourceUri) {
       this.exception = ObjectUtils.requireNonNull(exception, "exception");
-      this.documentUri = ObjectUtils.requireNonNull(documentUri, "documentUri");
+      this.documentUri = ObjectUtils.requireNonNull(resourceUri, "documentUri");
+    }
+
+    @Override
+    public String getIdentifier() {
+      // always null
+      return null;
+    }
+
+    @Override
+    public Kind getKind() {
+      return IValidationFinding.Kind.FAIL;
     }
 
     @Override
@@ -133,6 +213,22 @@ public URI getDocumentUri() {
       return documentUri;
     }
 
+    @Override
+    public IResourceLocation getLocation() {
+      // not known
+      return null;
+    }
+
+    @Override
+    public String getPathKind() {
+      return "JSON-pointer";
+    }
+
+    @Override
+    public String getPath() {
+      return getCause().getPointerToViolation();
+    }
+
     @SuppressWarnings("null")
     @Override
     public String getMessage() {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/XmlSchemaContentValidator.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/XmlSchemaContentValidator.java
index d841dd425..a28a0059e 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/XmlSchemaContentValidator.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/validation/XmlSchemaContentValidator.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.core.model.validation;
 
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -49,6 +50,9 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * Supports validating an XML resource using an XML schema.
+ */
 public class XmlSchemaContentValidator
     extends AbstractContentValidator {
   private final Schema schema;
@@ -69,15 +73,30 @@ private static Schema toSchema(@NonNull List<? extends Source> schemaSources) th
     return retval;
   }
 
+  /**
+   * Construct a new XML schema validator using the provided XML schema sources.
+   *
+   * @param schemaSources
+   *          the XML schemas to use for validation
+   * @throws SAXException
+   *           if an error occurred while parsing the provided XML schemas
+   */
   public XmlSchemaContentValidator(@NonNull List<? extends Source> schemaSources) throws SAXException {
     this(toSchema(ObjectUtils.requireNonNull(schemaSources, "schemaSources")));
   }
 
+  /**
+   * Construct a new XML schema validator using the provided pre-parsed XML
+   * schema(s).
+   *
+   * @param schema
+   *          the pre-parsed XML schema(s) to use for validation
+   */
   protected XmlSchemaContentValidator(@NonNull Schema schema) {
     this.schema = ObjectUtils.requireNonNull(schema, "schema");
   }
 
-  public Schema getSchema() {
+  private Schema getSchema() {
     return schema;
   }
 
@@ -85,7 +104,7 @@ public Schema getSchema() {
   public IValidationResult validate(InputStream is, URI documentUri) throws IOException {
     Source xmlSource = new StreamSource(is, documentUri.toASCIIString());
 
-    Validator validator = schema.newValidator();
+    Validator validator = getSchema().newValidator();
     XmlValidationErrorHandler errorHandler = new XmlValidationErrorHandler(documentUri);
     validator.setErrorHandler(errorHandler);
     try {
@@ -96,7 +115,11 @@ public IValidationResult validate(InputStream is, URI documentUri) throws IOExce
     return errorHandler;
   }
 
-  public static class XmlValidationFinding implements IValidationFinding {
+  /**
+   * Records an identified individual validation result found during XML schema
+   * validation.
+   */
+  public static class XmlValidationFinding implements IValidationFinding, IResourceLocation {
     @NonNull
     private final URI documentUri;
     @NonNull
@@ -104,11 +127,36 @@ public static class XmlValidationFinding implements IValidationFinding {
     @NonNull
     private final Level severity;
 
-    public XmlValidationFinding(@NonNull Level severity, @NonNull SAXParseException exception,
-        @NonNull URI documentUri) {
-      this.documentUri = ObjectUtils.requireNonNull(documentUri, "documentUri");
-      this.exception = ObjectUtils.requireNonNull(exception, "exception");
+    /**
+     * Construct a new XML schema validation finding, which represents an issue
+     * identified during XML schema validation.
+     *
+     * @param severity
+     *          the finding significance
+     * @param exception
+     *          the XML schema validation exception generated during schema
+     *          validation representing the issue
+     * @param resourceUri
+     *          the resource the issue was found in
+     */
+    public XmlValidationFinding(
+        @NonNull Level severity,
+        @NonNull SAXParseException exception,
+        @NonNull URI resourceUri) {
       this.severity = ObjectUtils.requireNonNull(severity, "severity");
+      this.exception = ObjectUtils.requireNonNull(exception, "exception");
+      this.documentUri = ObjectUtils.requireNonNull(resourceUri, "documentUri");
+    }
+
+    @Override
+    public String getIdentifier() {
+      // always null
+      return null;
+    }
+
+    @Override
+    public Kind getKind() {
+      return Level.WARNING.equals(getSeverity()) ? Kind.PASS : Kind.FAIL;
     }
 
     @Override
@@ -123,6 +171,46 @@ public URI getDocumentUri() {
       return systemId == null ? documentUri : URI.create(systemId);
     }
 
+    @Override
+    public int getLine() {
+      return getCause().getLineNumber();
+    }
+
+    @Override
+    public int getColumn() {
+      return getCause().getColumnNumber();
+    }
+
+    @Override
+    public long getCharOffset() {
+      // not known
+      return -1;
+    }
+
+    @Override
+    public long getByteOffset() {
+      // not known
+      return -1;
+    }
+
+    @Override
+    public IResourceLocation getLocation() {
+      // TODO Auto-generated method stub
+      return this;
+    }
+
+    @Override
+    public String getPathKind() {
+      // not known
+      return null;
+    }
+
+    @Override
+    public String getPath() {
+      // not known
+      return null;
+    }
+
     @SuppressWarnings("null")
     @Override
     public String getMessage() {
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/ExternalConstraintsModulePostProcessor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/ExternalConstraintsModulePostProcessor.java
index 30bee9958..8cf42476f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/ExternalConstraintsModulePostProcessor.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/ExternalConstraintsModulePostProcessor.java
@@ -26,9 +26,11 @@
 
 package gov.nist.secauto.metaschema.core.model.xml;
 
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
 import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.metapath.MetapathExpression.ResultType;
+import gov.nist.secauto.metaschema.core.metapath.StaticContext;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem;
@@ -50,11 +52,23 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * A module loading post processor that integrates applicable external
+ * constraints into a given module when loaded.
+ *
+ * @see ModuleLoader#ModuleLoader(List)
+ */
 public class ExternalConstraintsModulePostProcessor implements IModuleLoader.IModulePostProcessor {
   private static final Logger LOGGER = LogManager.getLogger(ExternalConstraintsModulePostProcessor.class);
   @NonNull
   private final List<IConstraintSet> registeredConstraintSets;
 
+  /**
+   * Create a new post processor.
+   *
+   * @param additionalConstraintSets
+   *          the external constraint sets to apply
+   */
   public ExternalConstraintsModulePostProcessor(@NonNull Collection<IConstraintSet> additionalConstraintSets) {
     this.registeredConstraintSets = ObjectUtils.notNull(additionalConstraintSets.stream()
         .flatMap(set -> Stream.concat(
@@ -64,6 +78,11 @@ public ExternalConstraintsModulePostProcessor(@NonNull Collection<IConstraintSet
         .collect(Collectors.toUnmodifiableList()));
   }
 
+  /**
+   * Get the external constraint sets associated with this post processor.
+   *
+   * @return the list of constraint sets
+   */
   protected List<IConstraintSet> getRegisteredConstraintSets() {
     return registeredConstraintSets;
   }
@@ -73,23 +92,40 @@ public void processModule(IModule module) {
     ConstraintComposingVisitor visitor = new ConstraintComposingVisitor();
     IModuleNodeItem moduleItem = INodeItemFactory.instance().newModuleNodeItem(module);
 
+    StaticContext staticContext = StaticContext.builder()
+        .defaultModelNamespace(module.getXmlNamespace())
+        .build();
+    DynamicContext dynamicContext = new DynamicContext(staticContext);
+
     for (IConstraintSet set : getRegisteredConstraintSets()) {
-      for (ITargetedConstraints targeted : set.getTargetedConstraintsForModule(module)) {
-        // apply targeted constraints
-        MetapathExpression targetExpression = targeted.getTargetExpression();
-        ISequence<?> items = targetExpression.evaluateAs(moduleItem, ResultType.SEQUENCE);
+      assert set != null;
+      applyConstraints(module, moduleItem, set, visitor, dynamicContext);
+    }
+  }
+
+  private static void applyConstraints(
+      @NonNull IModule module,
+      @NonNull IModuleNodeItem moduleItem,
+      @NonNull IConstraintSet set,
+      @NonNull ConstraintComposingVisitor visitor,
+      @NonNull DynamicContext dynamicContext) {
+    for (ITargetedConstraints targeted : set.getTargetedConstraintsForModule(module)) {
+      // apply targeted constraints
+      String targetExpression = targeted.getTargetExpression();
+      MetapathExpression metapath = MetapathExpression.compile(targetExpression, dynamicContext.getStaticContext());
+      ISequence<?> items = metapath.evaluateAs(moduleItem, ResultType.SEQUENCE, dynamicContext);
+      assert items != null;
 
-        if (items != null && !items.isEmpty()) {
-          for (IItem item : items) {
-            if (item instanceof IDefinitionNodeItem) {
-              ((IDefinitionNodeItem<?, ?>) item).accept(visitor, targeted);
-            } else {
-              // log error
-              if (LOGGER.isErrorEnabled()) {
-                LOGGER.atError().log("Found non-definition item '{}' while applying external constraints.",
-                    item.toString());
-              }
-            }
+      for (IItem item : items) {
+        if (item instanceof IDefinitionNodeItem) {
+          ((IDefinitionNodeItem<?, ?>) item).accept(visitor, targeted);
+        } else {
+          // log error
+          if (LOGGER.isErrorEnabled()) {
+            LOGGER.atError().log(
+                "Found non-definition item '{}' while applying external constraints using target expression '{}'.",
+                item.toString(),
+                targetExpression);
           }
         }
       }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/ModuleLoader.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/ModuleLoader.java
index d966fee1e..7d2d75b3a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/ModuleLoader.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/ModuleLoader.java
@@ -27,6 +27,7 @@
 package gov.nist.secauto.metaschema.core.model.xml;
 
 import gov.nist.secauto.metaschema.core.model.AbstractModuleLoader;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.IModuleLoader;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.model.xml.impl.XmlModule;
@@ -60,7 +61,7 @@
  * every use. Any Metaschema imported is also loaded and cached automatically.
  */
 public class ModuleLoader
-    extends AbstractModuleLoader<METASCHEMADocument, IXmlModule> {
+    extends AbstractModuleLoader<METASCHEMADocument, IMetaschemaModule> {
   private boolean resolveEntities; // = false;
 
   /**
@@ -92,7 +93,8 @@ public void allowEntityResolution() {
   }
 
   @Override
-  protected IXmlModule newModule(URI resource, METASCHEMADocument binding, List<IXmlModule> importedModules)
+  protected IMetaschemaModule newModule(URI resource, METASCHEMADocument binding,
+      List<? extends IMetaschemaModule> importedModules)
       throws MetaschemaException {
     return new XmlModule(resource, binding, importedModules);
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/XmlConstraintLoader.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/XmlConstraintLoader.java
index 33b0ff0b1..97e76bea1 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/XmlConstraintLoader.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/XmlConstraintLoader.java
@@ -27,7 +27,6 @@
 package gov.nist.secauto.metaschema.core.model.xml;
 
 import gov.nist.secauto.metaschema.core.metapath.MetapathException;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.AbstractLoader;
 import gov.nist.secauto.metaschema.core.model.IConstraintLoader;
 import gov.nist.secauto.metaschema.core.model.IModule;
@@ -82,6 +81,7 @@
  * every use. Any constraint set imported is also loaded and cached
  * automatically.
  */
+@SuppressWarnings("PMD.CouplingBetweenObjects")
 public class XmlConstraintLoader
     extends AbstractLoader<IConstraintSet>
     implements IConstraintLoader {
@@ -220,35 +220,38 @@ private static void handleScopedAssembly( // NOPMD false positive
       @NonNull XmlObject obj,
       Pair<ISource, List<ITargetedConstraints>> state) {
     Scope.Assembly assembly = (Scope.Assembly) obj;
-    MetapathExpression expression = ObjectUtils.requireNonNull(assembly.getTarget());
 
     IModelConstrained constraints = new AssemblyConstraintSet();
     ConstraintXmlSupport.parse(constraints, assembly, ObjectUtils.notNull(state.getLeft()));
 
-    state.getRight().add(new AssemblyTargetedConstraints(expression, constraints));
+    state.getRight().add(new AssemblyTargetedConstraints(
+        ObjectUtils.requireNonNull(assembly.getTarget()),
+        constraints));
   }
 
   private static void handleScopedField( // NOPMD false positive
       @NonNull XmlObject obj,
       Pair<ISource, List<ITargetedConstraints>> state) {
     Scope.Field field = (Scope.Field) obj;
-    MetapathExpression expression = ObjectUtils.requireNonNull(field.getTarget());
 
     IValueConstrained constraints = new ValueConstraintSet();
     ConstraintXmlSupport.parse(constraints, field, ObjectUtils.notNull(state.getLeft()));
 
-    state.getRight().add(new FieldTargetedConstraints(expression, constraints));
+    state.getRight().add(new FieldTargetedConstraints(
+        ObjectUtils.requireNonNull(field.getTarget()),
+        constraints));
   }
 
   private static void handleScopedFlag( // NOPMD false positive
       @NonNull XmlObject obj,
       Pair<ISource, List<ITargetedConstraints>> state) {
     Scope.Flag flag = (Scope.Flag) obj;
-    MetapathExpression expression = ObjectUtils.requireNonNull(flag.getTarget());
 
     IValueConstrained constraints = new ValueConstraintSet();
     ConstraintXmlSupport.parse(constraints, flag, ObjectUtils.notNull(state.getLeft()));
 
-    state.getRight().add(new FlagTargetedConstraints(expression, constraints));
+    state.getRight().add(new FlagTargetedConstraints(
+        ObjectUtils.requireNonNull(flag.getTarget()),
+        constraints));
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/XmlMetaConstraintLoader.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/XmlMetaConstraintLoader.java
index 016c3326e..11e0fae12 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/XmlMetaConstraintLoader.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/XmlMetaConstraintLoader.java
@@ -26,7 +26,6 @@
 
 package gov.nist.secauto.metaschema.core.model.xml;
 
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.AbstractLoader;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IConstraintLoader;
@@ -43,6 +42,7 @@
 import gov.nist.secauto.metaschema.core.model.constraint.ITargetedConstraints;
 import gov.nist.secauto.metaschema.core.model.xml.impl.ConstraintXmlSupport;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.MetaschemaMetaConstraintsDocument;
+import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.MetaschemaMetapathReferenceType;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.ModelContextType;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -90,13 +90,13 @@ private Context parseContext(
     List<String> metapaths;
     if (parent == null) {
       metapaths = ObjectUtils.notNull(contextObj.getMetapathList().stream()
-          .map(metapath -> metapath.getTarget())
+          .map(MetaschemaMetapathReferenceType::getTarget)
           .collect(Collectors.toList()));
     } else {
       List<String> parentMetapaths = parent.getMetapaths().stream()
           .collect(Collectors.toList());
       metapaths = ObjectUtils.notNull(contextObj.getMetapathList().stream()
-          .map(metapath -> metapath.getTarget())
+          .map(MetaschemaMetapathReferenceType::getTarget)
           .flatMap(childPath -> {
             return parentMetapaths.stream()
                 .map(parentPath -> parentPath + '/' + childPath);
@@ -157,7 +157,6 @@ public Context(
     public List<ITargetedConstraints> getTargetedConstraints() {
       return Stream.concat(
           getMetapaths().stream()
-              .map(metapath -> MetapathExpression.compile(ObjectUtils.notNull(metapath)))
               .map(metapath -> new MetaTargetedContraints(ObjectUtils.notNull(metapath), constraints)),
           childContexts.stream()
               .flatMap(child -> child.getTargetedConstraints().stream()))
@@ -178,7 +177,7 @@ private static class MetaTargetedContraints
       implements IFeatureModelConstrained {
 
     protected MetaTargetedContraints(
-        @NonNull MetapathExpression target,
+        @NonNull String target,
         @NonNull IModelConstrained constraints) {
       super(target, constraints);
     }
@@ -192,20 +191,18 @@ protected MetaTargetedContraints(
      * @param definition
      *          the definition to apply the constraints to.
      */
-    @SuppressWarnings("null")
     protected void applyTo(@NonNull IDefinition definition) {
-      getAllowedValuesConstraints().forEach(constraint -> definition.addConstraint(constraint));
-      getMatchesConstraints().forEach(constraint -> definition.addConstraint(constraint));
-      getIndexHasKeyConstraints().forEach(constraint -> definition.addConstraint(constraint));
-      getExpectConstraints().forEach(constraint -> definition.addConstraint(constraint));
+      getAllowedValuesConstraints().forEach(definition::addConstraint);
+      getMatchesConstraints().forEach(definition::addConstraint);
+      getIndexHasKeyConstraints().forEach(definition::addConstraint);
+      getExpectConstraints().forEach(definition::addConstraint);
     }
 
-    @SuppressWarnings("null")
     protected void applyTo(@NonNull IAssemblyDefinition definition) {
       applyTo((IDefinition) definition);
-      getIndexConstraints().forEach(constraint -> definition.addConstraint(constraint));
-      getUniqueConstraints().forEach(constraint -> definition.addConstraint(constraint));
-      getHasCardinalityConstraints().forEach(constraint -> definition.addConstraint(constraint));
+      getIndexConstraints().forEach(definition::addConstraint);
+      getUniqueConstraints().forEach(definition::addConstraint);
+      getHasCardinalityConstraints().forEach(definition::addConstraint);
     }
 
     @Override
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultContainerModelAssemblySupport.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultContainerModelAssemblySupport.java
index 65c29ffbb..84cff94b3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultContainerModelAssemblySupport.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultContainerModelAssemblySupport.java
@@ -42,6 +42,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -165,9 +167,9 @@ public DefaultContainerModelAssemblySupport(
    */
   protected DefaultContainerModelAssemblySupport(
       @NonNull List<MI> instances,
-      @NonNull Map<String, NMI> namedModelInstances,
-      @NonNull Map<String, FI> fieldInstances,
-      @NonNull Map<String, AI> assemblyInstances,
+      @NonNull Map<QName, NMI> namedModelInstances,
+      @NonNull Map<QName, FI> fieldInstances,
+      @NonNull Map<QName, AI> assemblyInstances,
       @NonNull List<CI> choiceInstances,
       @NonNull Map<String, CGI> choiceGroupInstances) {
     super(instances, namedModelInstances, fieldInstances, assemblyInstances);
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultContainerModelSupport.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultContainerModelSupport.java
index 7482c7ae4..0ae862d9b 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultContainerModelSupport.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultContainerModelSupport.java
@@ -40,7 +40,10 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Provides model container support.
@@ -76,11 +79,11 @@ public class DefaultContainerModelSupport<
   @NonNull
   private final List<MI> modelInstances;
   @NonNull
-  private final Map<String, NMI> namedModelInstances;
+  private final Map<QName, NMI> namedModelInstances;
   @NonNull
-  private final Map<String, FI> fieldInstances;
+  private final Map<QName, FI> fieldInstances;
   @NonNull
-  private final Map<String, AI> assemblyInstances;
+  private final Map<QName, AI> assemblyInstances;
 
   /**
    * Construct an empty, mutable container.
@@ -107,7 +110,8 @@ public DefaultContainerModelSupport() {
    *          the Java type for assembly instances
    */
   @SuppressWarnings({ "PMD.UseConcurrentHashMap" })
-  public DefaultContainerModelSupport(
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
+  protected DefaultContainerModelSupport(
       @NonNull Collection<MI> instances,
       @NonNull Class<NMI> namedModelClass,
       @NonNull Class<FI> fieldClass,
@@ -127,13 +131,13 @@ public DefaultContainerModelSupport(
 
     this.modelInstances = ObjectUtils.notNull(List.copyOf(instances));
 
-    Map<String, NMI> namedModelInstances = new LinkedHashMap<>();
-    Map<String, FI> fieldInstances = new LinkedHashMap<>();
-    Map<String, AI> assemblyInstances = new LinkedHashMap<>();
+    Map<QName, NMI> namedModelInstances = new LinkedHashMap<>();
+    Map<QName, FI> fieldInstances = new LinkedHashMap<>();
+    Map<QName, AI> assemblyInstances = new LinkedHashMap<>();
     for (MI instance : instances) {
       if (namedModelClass.isInstance(instance)) {
         NMI named = namedModelClass.cast(instance);
-        String key = named.getEffectiveName();
+        QName key = named.getXmlQName();
         namedModelInstances.put(key, named);
 
         if (fieldClass.isInstance(instance)) {
@@ -169,9 +173,9 @@ public DefaultContainerModelSupport(
    */
   protected DefaultContainerModelSupport(
       @NonNull List<MI> modelInstances,
-      @NonNull Map<String, NMI> namedModelInstances,
-      @NonNull Map<String, FI> fieldInstances,
-      @NonNull Map<String, AI> assemblyInstances) {
+      @NonNull Map<QName, NMI> namedModelInstances,
+      @NonNull Map<QName, FI> fieldInstances,
+      @NonNull Map<QName, AI> assemblyInstances) {
     this.modelInstances = modelInstances;
     this.namedModelInstances = namedModelInstances;
     this.fieldInstances = fieldInstances;
@@ -184,17 +188,17 @@ public List<MI> getModelInstances() {
   }
 
   @Override
-  public Map<String, NMI> getNamedModelInstanceMap() {
+  public Map<QName, NMI> getNamedModelInstanceMap() {
     return namedModelInstances;
   }
 
   @Override
-  public Map<String, FI> getFieldInstanceMap() {
+  public Map<QName, FI> getFieldInstanceMap() {
     return fieldInstances;
   }
 
   @Override
-  public Map<String, AI> getAssemblyInstanceMap() {
+  public Map<QName, AI> getAssemblyInstanceMap() {
     return assemblyInstances;
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultGroupedModelContainerSupport.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultGroupedModelContainerSupport.java
index 67666163d..749d6baad 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultGroupedModelContainerSupport.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/DefaultGroupedModelContainerSupport.java
@@ -36,7 +36,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Supports grouped model instance operations on assembly model instances.
@@ -62,11 +65,11 @@ public class DefaultGroupedModelContainerSupport<
     implements IContainerModelSupport<NMI, NMI, FI, AI> {
 
   @NonNull
-  private final Map<String, NMI> namedModelInstances;
+  private final Map<QName, NMI> namedModelInstances;
   @NonNull
-  private final Map<String, FI> fieldInstances;
+  private final Map<QName, FI> fieldInstances;
   @NonNull
-  private final Map<String, AI> assemblyInstances;
+  private final Map<QName, AI> assemblyInstances;
 
   /**
    * Construct an empty, mutable container.
@@ -90,7 +93,8 @@ public DefaultGroupedModelContainerSupport() {
    *          the Java type for assembly instances
    */
   @SuppressWarnings({ "PMD.UseConcurrentHashMap" })
-  public DefaultGroupedModelContainerSupport(
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
+  private DefaultGroupedModelContainerSupport(
       @NonNull Collection<NMI> instances,
       @NonNull Class<FI> fieldClass,
       @NonNull Class<AI> assemblyClass) {
@@ -99,11 +103,11 @@ public DefaultGroupedModelContainerSupport(
         fieldClass.getName(),
         assemblyClass.getName());
 
-    Map<String, NMI> namedModelInstances = new LinkedHashMap<>();
-    Map<String, FI> fieldInstances = new LinkedHashMap<>();
-    Map<String, AI> assemblyInstances = new LinkedHashMap<>();
+    Map<QName, NMI> namedModelInstances = new LinkedHashMap<>();
+    Map<QName, FI> fieldInstances = new LinkedHashMap<>();
+    Map<QName, AI> assemblyInstances = new LinkedHashMap<>();
     for (NMI instance : instances) {
-      String key = instance.getEffectiveName();
+      QName key = instance.getXmlQName();
       namedModelInstances.put(key, instance);
 
       if (fieldClass.isInstance(instance)) {
@@ -135,9 +139,9 @@ public DefaultGroupedModelContainerSupport(
    *          a collection of assembly instances
    */
   protected DefaultGroupedModelContainerSupport(
-      @NonNull Map<String, NMI> namedModelInstances,
-      @NonNull Map<String, FI> fieldInstances,
-      @NonNull Map<String, AI> assemblyInstances) {
+      @NonNull Map<QName, NMI> namedModelInstances,
+      @NonNull Map<QName, FI> fieldInstances,
+      @NonNull Map<QName, AI> assemblyInstances) {
     this.namedModelInstances = namedModelInstances;
     this.fieldInstances = fieldInstances;
     this.assemblyInstances = assemblyInstances;
@@ -150,17 +154,17 @@ public Collection<NMI> getModelInstances() {
   }
 
   @Override
-  public Map<String, NMI> getNamedModelInstanceMap() {
+  public Map<QName, NMI> getNamedModelInstanceMap() {
     return namedModelInstances;
   }
 
   @Override
-  public Map<String, FI> getFieldInstanceMap() {
+  public Map<QName, FI> getFieldInstanceMap() {
     return fieldInstances;
   }
 
   @Override
-  public Map<String, AI> getAssemblyInstanceMap() {
+  public Map<QName, AI> getAssemblyInstanceMap() {
     return assemblyInstances;
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/IXmlObjectBinding.java
similarity index 73%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinition.java
rename to core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/IXmlObjectBinding.java
index 0720957c0..25e1d260f 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/IXmlObjectBinding.java
@@ -24,28 +24,32 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model;
+package gov.nist.secauto.metaschema.core.model.xml.impl;
 
-import gov.nist.secauto.metaschema.core.model.IDefinition;
-import gov.nist.secauto.metaschema.databind.IBindingContext;
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
+
+import org.apache.xmlbeans.XmlObject;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
-/**
- * Represents a Metaschema module definition bound to Java data.
- */
-public interface IBoundDefinition extends IDefinition, IBoundModuleElement {
+public interface IXmlObjectBinding {
   /**
-   * Get the binding context used for the definition.
+   * Get the underlying XML data.
    *
-   * @return the binding context
+   * @return the underlying XML data
    */
   @NonNull
-  IBindingContext getBindingContext();
+  XmlObject getXmlObject();
 
   /**
-   * Get the Metaschema module containing this definition.
+   * Get the location information for this object, if the location is available.
+   *
+   * @return the location information or {@code null} if the location information
+   *         is unavailable
    */
-  @Override
-  IBoundModule getContainingModule();
+  @Nullable
+  default IResourceLocation getLocation() {
+    return XmlBeansLocation.toLocation(getXmlObject());
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/ModelFactory.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/ModelFactory.java
index 49b21d82b..60d515340 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/ModelFactory.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/ModelFactory.java
@@ -27,7 +27,6 @@
 package gov.nist.secauto.metaschema.core.model.xml.impl;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.constraint.AbstractConstraintBuilder;
 import gov.nist.secauto.metaschema.core.model.constraint.AbstractKeyConstraintBuilder;
@@ -70,6 +69,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -80,8 +81,8 @@ private ModelFactory() {
   }
 
   @NonNull
-  private static MetapathExpression target(@Nullable MetapathExpression target) {
-    return target == null ? IConstraint.DEFAULT_TARGET : target;
+  private static String target(@Nullable String target) {
+    return target == null ? IConstraint.DEFAULT_TARGET_METAPATH : target;
   }
 
   @NonNull
@@ -174,13 +175,13 @@ public static IAllowedValuesConstraint newAllowedValuesConstraint(
   public static IAllowedValuesConstraint newAllowedValuesConstraint(
       @NonNull AllowedValuesType xmlObject,
       @NonNull ISource source) {
-    return newAllowedValuesConstraint(xmlObject, MetapathExpression.CONTEXT_NODE, source);
+    return newAllowedValuesConstraint(xmlObject, IConstraint.DEFAULT_TARGET_METAPATH, source);
   }
 
   @NonNull
   private static IAllowedValuesConstraint newAllowedValuesConstraint(
       @NonNull AllowedValuesType xmlObject,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull ISource source) {
 
     IAllowedValuesConstraint.Builder builder = IAllowedValuesConstraint.builder();
@@ -193,7 +194,7 @@ private static IAllowedValuesConstraint newAllowedValuesConstraint(
 
     builder.allowedValues(toAllowedValues(xmlObject));
     if (xmlObject.isSetAllowOther()) {
-      builder.allowedOther(xmlObject.getAllowOther());
+      builder.allowsOther(xmlObject.getAllowOther());
     }
     if (xmlObject.isSetExtensible()) {
       builder.extensible(ObjectUtils.notNull(xmlObject.getExtensible()));
@@ -205,7 +206,7 @@ private static IAllowedValuesConstraint newAllowedValuesConstraint(
   @NonNull
   private static <T extends AbstractConstraintBuilder<T, ?>> T applyToBuilder(
       @NonNull ConstraintType xmlObject,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull ISource source,
       @NonNull T builder) {
 
@@ -247,13 +248,13 @@ public static IMatchesConstraint newMatchesConstraint(
   public static IMatchesConstraint newMatchesConstraint(
       @NonNull MatchesConstraintType xmlConstraint,
       @NonNull ISource source) {
-    return newMatchesConstraint(xmlConstraint, MetapathExpression.CONTEXT_NODE, source);
+    return newMatchesConstraint(xmlConstraint, IConstraint.DEFAULT_TARGET_METAPATH, source);
   }
 
   @NonNull
   private static IMatchesConstraint newMatchesConstraint(
       @NonNull MatchesConstraintType xmlObject,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull ISource source) {
     IMatchesConstraint.Builder builder = IMatchesConstraint.builder();
 
@@ -324,7 +325,7 @@ public static IUniqueConstraint newUniqueConstraint(
   public static IIndexConstraint newIndexConstraint(
       @NonNull TargetedIndexConstraintType xmlObject,
       @NonNull ISource source) {
-    IIndexConstraint.Builder builder = IIndexConstraint.builder();
+    IIndexConstraint.Builder builder = IIndexConstraint.builder(ObjectUtils.requireNonNull(xmlObject.getName()));
 
     applyToBuilder(xmlObject, target(xmlObject.getTarget()), source, builder);
 
@@ -332,7 +333,6 @@ public static IIndexConstraint newIndexConstraint(
       builder.remarks(remarks(ObjectUtils.notNull(xmlObject.getRemarks())));
     }
 
-    builder.name(ObjectUtils.requireNonNull(xmlObject.getName()));
     buildKeyFields(xmlObject, builder);
 
     return builder.build();
@@ -367,16 +367,17 @@ public static IIndexHasKeyConstraint newIndexHasKeyConstraint(
   public static IIndexHasKeyConstraint newIndexHasKeyConstraint(
       @NonNull IndexHasKeyConstraintType xmlObject,
       @NonNull ISource source) {
-    return newIndexHasKeyConstraint(xmlObject, MetapathExpression.CONTEXT_NODE, source);
+    return newIndexHasKeyConstraint(xmlObject, IConstraint.DEFAULT_TARGET_METAPATH, source);
 
   }
 
   @NonNull
   private static IIndexHasKeyConstraint newIndexHasKeyConstraint(
       @NonNull IndexHasKeyConstraintType xmlObject,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull ISource source) {
-    IIndexHasKeyConstraint.Builder builder = IIndexHasKeyConstraint.builder();
+    IIndexHasKeyConstraint.Builder builder
+        = IIndexHasKeyConstraint.builder(ObjectUtils.requireNonNull(xmlObject.getName()));
 
     applyToBuilder(xmlObject, target, source, builder);
 
@@ -384,7 +385,6 @@ private static IIndexHasKeyConstraint newIndexHasKeyConstraint(
       builder.remarks(remarks(ObjectUtils.notNull(xmlObject.getRemarks())));
     }
 
-    builder.name(ObjectUtils.requireNonNull(xmlObject.getName()));
     buildKeyFields(xmlObject, builder);
 
     return builder.build();
@@ -419,13 +419,13 @@ public static IExpectConstraint newExpectConstraint(
   public static IExpectConstraint newExpectConstraint(
       @NonNull ExpectConstraintType xmlObject,
       @NonNull ISource source) {
-    return newExpectConstraint(xmlObject, MetapathExpression.CONTEXT_NODE, source);
+    return newExpectConstraint(xmlObject, IConstraint.DEFAULT_TARGET_METAPATH, source);
   }
 
   @NonNull
   private static IExpectConstraint newExpectConstraint(
       @NonNull ExpectConstraintType xmlConstraint,
-      @NonNull MetapathExpression target,
+      @NonNull String target,
       @NonNull ISource source) {
 
     IExpectConstraint.Builder builder = IExpectConstraint.builder();
@@ -491,8 +491,9 @@ public static ICardinalityConstraint newCardinalityConstraint(
   public static ILet newLet(
       @NonNull ConstraintLetType xmlObject,
       @NonNull ISource source) {
+    // TODO: figure out how to resolve the namespace prefix on var
     return ILet.of(
-        ObjectUtils.notNull(xmlObject.getVar()),
+        new QName(xmlObject.getVar()),
         ObjectUtils.notNull(xmlObject.getExpression()),
         source);
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlAssemblyInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlAssemblyInstance.java
index 2bbad0e53..1795b7d44 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlAssemblyInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlAssemblyInstance.java
@@ -28,19 +28,17 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractAssemblyInstance;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IContainerModel;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.AssemblyReferenceType;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.MarkupLineDatatype;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.UseNameType;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.Map;
 import java.util.Set;
@@ -48,9 +46,13 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 class XmlAssemblyInstance
-    extends AbstractInstance<IContainerModel>
-    implements IAssemblyInstanceAbsolute,
-    IFeatureDefinitionReferenceInstance<IAssemblyDefinition, IAssemblyInstanceAbsolute> {
+    extends AbstractAssemblyInstance<
+        IContainerModel,
+        IAssemblyDefinition,
+        IAssemblyInstanceAbsolute,
+        IAssemblyDefinition>
+    implements IAssemblyInstanceAbsolute {
+  @NonNull
   private final AssemblyReferenceType xmlObject;
 
   /**
@@ -69,13 +71,6 @@ public XmlAssemblyInstance(
     this.xmlObject = xmlObject;
   }
 
-  @Override
-  public IAssemblyDefinition getDefinition() {
-    // This will always be not null
-    return ObjectUtils.notNull(getContainingModule()
-        .getScopedAssemblyDefinitionByName(getName()));
-  }
-
   // ----------------------------------------
   // - Start XmlBeans driven code - CPD-OFF -
   // ----------------------------------------
@@ -85,6 +80,7 @@ public IAssemblyDefinition getDefinition() {
    *
    * @return the underlying XML data
    */
+  @NonNull
   protected AssemblyReferenceType getXmlObject() {
     return xmlObject;
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlAssemblyModelContainer.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlAssemblyModelContainer.java
index 7fe54c306..3f3c72ceb 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlAssemblyModelContainer.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlAssemblyModelContainer.java
@@ -197,20 +197,38 @@ private static void handleChoiceGroup( // NOPMD false positive
     container.getModelInstances().add(instance);
   }
 
+  /**
+   * Adds the provided instance to the tail of the model.
+   *
+   * @param instance
+   *          the instance to append
+   */
   public void append(@NonNull IFieldInstanceAbsolute instance) {
-    String key = instance.getEffectiveName();
+    QName key = instance.getXmlQName();
     getFieldInstanceMap().put(key, instance);
     getNamedModelInstanceMap().put(key, instance);
     getModelInstances().add(instance);
   }
 
+  /**
+   * Adds the provided instance to the tail of the model.
+   *
+   * @param instance
+   *          the instance to append
+   */
   public void append(@NonNull IAssemblyInstanceAbsolute instance) {
-    String key = instance.getEffectiveName();
+    QName key = instance.getXmlQName();
     getAssemblyInstanceMap().put(key, instance);
     getNamedModelInstanceMap().put(key, instance);
     getModelInstances().add(instance);
   }
 
+  /**
+   * Adds the provided instance to the tail of the model.
+   *
+   * @param instance
+   *          the instance to append
+   */
   public void append(@NonNull IChoiceInstance instance) {
     getChoiceInstances().add(instance);
     getModelInstances().add(instance);
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlBeansLocation.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlBeansLocation.java
new file mode 100644
index 000000000..9de1cf9ae
--- /dev/null
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlBeansLocation.java
@@ -0,0 +1,87 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.model.xml.impl;
+
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
+
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlCursor.XmlBookmark;
+import org.apache.xmlbeans.XmlLineNumber;
+import org.apache.xmlbeans.XmlObject;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+/**
+ * Provides location information for an XMLBeans object.
+ */
+public final class XmlBeansLocation implements IResourceLocation {
+  @NonNull
+  private final XmlLineNumber lineNumber;
+
+  /**
+   * Get the location information for an XMLBeans object if the location is
+   * available.
+   *
+   * @param xmlObject
+   *          the XMLBeans object to get the location information for
+   * @return the location information or {@code null} if the location information
+   *         is unavailable
+   */
+  @Nullable
+  public static IResourceLocation toLocation(@NonNull XmlObject xmlObject) {
+    try (XmlCursor cursor = xmlObject.newCursor()) {
+      XmlBookmark bookmark = cursor.getBookmark(XmlLineNumber.class);
+      return bookmark == null ? null : new XmlBeansLocation((XmlLineNumber) bookmark);
+    }
+  }
+
+  private XmlBeansLocation(@NonNull XmlLineNumber lineNumber) {
+    this.lineNumber = lineNumber;
+  }
+
+  @Override
+  public int getLine() {
+    return lineNumber.getLine();
+  }
+
+  @Override
+  public int getColumn() {
+    return lineNumber.getColumn();
+  }
+
+  @Override
+  public long getCharOffset() {
+    return lineNumber.getOffset();
+  }
+
+  @Override
+  public long getByteOffset() {
+    // not supported
+    return -1;
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlChoiceGroupInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlChoiceGroupInstance.java
index 008786c89..426f66f37 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlChoiceGroupInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlChoiceGroupInstance.java
@@ -27,11 +27,10 @@
 package gov.nist.secauto.metaschema.core.model.xml.impl;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractChoiceGroupInstance;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped;
 import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerModelGrouped;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped;
 import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped;
@@ -56,9 +55,11 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 class XmlChoiceGroupInstance
-    extends AbstractInstance<IAssemblyDefinition>
-    implements IChoiceGroupInstance,
-    IFeatureContainerModelGrouped<INamedModelInstanceGrouped, IFieldInstanceGrouped, IAssemblyInstanceGrouped> {
+    extends AbstractChoiceGroupInstance<
+        IAssemblyDefinition,
+        INamedModelInstanceGrouped,
+        IFieldInstanceGrouped,
+        IAssemblyInstanceGrouped> {
   @NonNull
   private final GroupedChoiceType xmlObject;
   @NonNull
@@ -108,11 +109,11 @@ protected GroupedChoiceType getXmlObject() {
   public String getJsonDiscriminatorProperty() {
     return getXmlObject().isSetDiscriminator()
         ? ObjectUtils.requireNonNull(getXmlObject().getDiscriminator())
-        : IChoiceGroupInstance.DEFAULT_JSON_DISCRIMINATOR_PROPERTY_NAME;
+        : DEFAULT_JSON_DISCRIMINATOR_PROPERTY_NAME;
   }
 
   @Override
-  public String getJsonKeyFlagName() {
+  public String getJsonKeyFlagInstanceName() {
     return getXmlObject().isSetJsonKey() ? getXmlObject().getJsonKey().getFlagRef() : null;
   }
 
@@ -241,13 +242,13 @@ public XmlModelContainer(
     }
 
     public void append(@NonNull IFieldInstanceGrouped instance) {
-      String key = instance.getEffectiveName();
+      QName key = instance.getXmlQName();
       getFieldInstanceMap().put(key, instance);
       getNamedModelInstanceMap().put(key, instance);
     }
 
     public void append(@NonNull IAssemblyInstanceGrouped instance) {
-      String key = instance.getEffectiveName();
+      QName key = instance.getXmlQName();
       getAssemblyInstanceMap().put(key, instance);
       getNamedModelInstanceMap().put(key, instance);
     }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlChoiceInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlChoiceInstance.java
index f34c87605..e6a78645c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlChoiceInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlChoiceInstance.java
@@ -27,11 +27,10 @@
 package gov.nist.secauto.metaschema.core.model.xml.impl;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractChoiceInstance;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerModelAbsolute;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IModule;
@@ -55,9 +54,8 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 class XmlChoiceInstance
-    extends AbstractInstance<IAssemblyDefinition>
-    implements IChoiceInstance,
-    IFeatureContainerModelAbsolute<
+    extends AbstractChoiceInstance<
+        IAssemblyDefinition,
         IModelInstanceAbsolute,
         INamedModelInstanceAbsolute,
         IFieldInstanceAbsolute,
@@ -88,23 +86,6 @@ public XmlModelContainer getModelContainer() {
     return ObjectUtils.notNull(modelContainer.get());
   }
 
-  @Override
-  public String getGroupAsName() {
-    // a choice does not have a groups-as name
-    return null;
-  }
-
-  @Override
-  public String getJsonKeyFlagName() {
-    // choices do not have a JSON key flag
-    return null;
-  }
-
-  @Override
-  public boolean hasChildren() {
-    return !getModelContainer().getModelInstances().isEmpty();
-  }
-
   // ----------------------------------------
   // - Start XmlBeans driven code - CPD-OFF -
   // ----------------------------------------
@@ -131,36 +112,33 @@ public MarkupMultiline getRemarks() {
 
   @SuppressWarnings("PMD.UseConcurrentHashMap")
   @NonNull
-  private static final XmlObjectParser<Pair<IChoiceInstance, XmlModelContainer>> XML_MODEL_PARSER
-      = new XmlObjectParser<>(ObjectUtils.notNull(
-          Map.ofEntries(
-              Map.entry(new QName(IModule.XML_NAMESPACE, "assembly"),
-                  XmlChoiceInstance::handleAssembly),
-              Map.entry(new QName(IModule.XML_NAMESPACE, "define-assembly"),
-                  XmlChoiceInstance::handleDefineAssembly),
-              Map.entry(new QName(IModule.XML_NAMESPACE, "field"),
-                  XmlChoiceInstance::handleField),
-              Map.entry(new QName(IModule.XML_NAMESPACE, "define-field"),
-                  XmlChoiceInstance::handleDefineField)))) {
-
-        @Override
-        protected Handler<Pair<IChoiceInstance, XmlModelContainer>>
-            identifyHandler(XmlCursor cursor, XmlObject obj) {
-          Handler<Pair<IChoiceInstance, XmlModelContainer>> retval;
-          if (obj instanceof FieldReferenceType) {
-            retval = XmlChoiceInstance::handleField;
-          } else if (obj instanceof InlineFieldDefinitionType) {
-            retval = XmlChoiceInstance::handleDefineField;
-          } else if (obj instanceof AssemblyReferenceType) {
-            retval = XmlChoiceInstance::handleAssembly;
-          } else if (obj instanceof InlineAssemblyDefinitionType) {
-            retval = XmlChoiceInstance::handleDefineAssembly;
-          } else {
-            retval = super.identifyHandler(cursor, obj);
-          }
-          return retval;
-        }
-      };
+  private static final XmlObjectParser<Pair<IChoiceInstance,
+      XmlModelContainer>> XML_MODEL_PARSER
+          = new XmlObjectParser<>(ObjectUtils.notNull(
+              Map.ofEntries(Map.entry(new QName(IModule.XML_NAMESPACE, "assembly"), XmlChoiceInstance::handleAssembly),
+                  Map.entry(new QName(IModule.XML_NAMESPACE, "define-assembly"),
+                      XmlChoiceInstance::handleDefineAssembly),
+                  Map.entry(new QName(IModule.XML_NAMESPACE, "field"), XmlChoiceInstance::handleField),
+                  Map.entry(new QName(IModule.XML_NAMESPACE, "define-field"), XmlChoiceInstance::handleDefineField)))) {
+
+            @Override
+            protected Handler<Pair<IChoiceInstance, XmlModelContainer>> identifyHandler(XmlCursor cursor,
+                XmlObject obj) {
+              Handler<Pair<IChoiceInstance, XmlModelContainer>> retval;
+              if (obj instanceof FieldReferenceType) {
+                retval = XmlChoiceInstance::handleField;
+              } else if (obj instanceof InlineFieldDefinitionType) {
+                retval = XmlChoiceInstance::handleDefineField;
+              } else if (obj instanceof AssemblyReferenceType) {
+                retval = XmlChoiceInstance::handleAssembly;
+              } else if (obj instanceof InlineAssemblyDefinitionType) {
+                retval = XmlChoiceInstance::handleDefineAssembly;
+              } else {
+                retval = super.identifyHandler(cursor, obj);
+              }
+              return retval;
+            }
+          };
 
   private static void handleField( // NOPMD false positive
       @NonNull XmlObject obj,
@@ -220,14 +198,14 @@ public XmlModelContainer(
     }
 
     public void append(@NonNull IFieldInstanceAbsolute instance) {
-      String key = instance.getEffectiveName();
+      QName key = instance.getXmlQName();
       getFieldInstanceMap().put(key, instance);
       getNamedModelInstanceMap().put(key, instance);
       getModelInstances().add(instance);
     }
 
     public void append(@NonNull IAssemblyInstanceAbsolute instance) {
-      String key = instance.getEffectiveName();
+      QName key = instance.getXmlQName();
       getAssemblyInstanceMap().put(key, instance);
       getNamedModelInstanceMap().put(key, instance);
       getModelInstances().add(instance);
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFieldInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFieldInstance.java
index 4762fe67b..03d503eef 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFieldInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFieldInstance.java
@@ -28,11 +28,10 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractFieldInstance;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IContainerModel;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
@@ -49,9 +48,8 @@
 import edu.umd.cs.findbugs.annotations.Nullable;
 
 class XmlFieldInstance
-    extends AbstractInstance<IContainerModel>
-    implements IFieldInstanceAbsolute,
-    IFeatureDefinitionReferenceInstance<IFieldDefinition, IFieldInstanceAbsolute> {
+    extends AbstractFieldInstance<IContainerModel, IFieldDefinition, IFieldInstanceAbsolute, IAssemblyDefinition>
+    implements IFieldInstanceAbsolute {
   @NonNull
   private final FieldReferenceType xmlObject;
   @Nullable
@@ -66,7 +64,7 @@ class XmlFieldInstance
    * @param container
    *          the parent container, either a choice or assembly
    */
-  @SuppressWarnings("PMD.NullAssignment")
+  @SuppressWarnings({ "PMD.NullAssignment", "PMD.ConstructorCallsOverridableMethod" })
   public XmlFieldInstance(
       @NonNull FieldReferenceType xmlObject,
       @NonNull IContainerModel container) {
@@ -77,17 +75,6 @@ public XmlFieldInstance(
         : null;
   }
 
-  @Override
-  public final IFieldDefinition getDefinition() {
-    // this will always be not null
-    return ObjectUtils.notNull(getContainingModule().getScopedFieldDefinitionByName(getName()));
-  }
-
-  @Override
-  public IAssemblyDefinition getContainingDefinition() {
-    return getParentContainer().getOwningDefinition();
-  }
-
   // ----------------------------------------
   // - Start XmlBeans driven code - CPD-OFF -
   // ----------------------------------------
@@ -97,13 +84,14 @@ public IAssemblyDefinition getContainingDefinition() {
    *
    * @return the underlying XML data
    */
+  @NonNull
   protected final FieldReferenceType getXmlObject() {
     return xmlObject;
   }
 
   @Override
   public boolean isInXmlWrapped() {
-    return getXmlObject().getInXml().booleanValue();
+    return getXmlObject().getInXml();
   }
 
   @Override
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFlagContainerSupport.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFlagContainerSupport.java
index 6a7f4e605..885852edd 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFlagContainerSupport.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFlagContainerSupport.java
@@ -27,7 +27,9 @@
 package gov.nist.secauto.metaschema.core.model.xml.impl;
 
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IFlagContainerBuilder;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.core.model.IModule;
@@ -39,14 +41,12 @@
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.InlineAssemblyDefinitionType;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.InlineFieldDefinitionType;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.InlineFlagDefinitionType;
-import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlObject;
 
-import java.util.LinkedHashMap;
 import java.util.Map;
 
 import javax.xml.namespace.QName;
@@ -54,12 +54,14 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-@SuppressWarnings("PMD.NullAssignment") // readability
-class XmlFlagContainerSupport
-    extends DefaultContainerFlagSupport<IFlagInstance> {
+/**
+ * Supports parsing Metaschema assembly and field XMLBeans objects that contain
+ * flags.
+ */
+final class XmlFlagContainerSupport {
   @SuppressWarnings("PMD.UseConcurrentHashMap")
   @NonNull
-  private static final XmlObjectParser<Pair<IModelDefinition, Map<String, IFlagInstance>>> XML_MODEL_PARSER
+  private static final XmlObjectParser<Pair<IModelDefinition, IFlagContainerBuilder<IFlagInstance>>> XML_MODEL_PARSER
       = new XmlObjectParser<>(ObjectUtils.notNull(
           Map.ofEntries(
               Map.entry(new QName(IModule.XML_NAMESPACE, "flag"),
@@ -68,9 +70,10 @@ class XmlFlagContainerSupport
                   XmlFlagContainerSupport::handleDefineFlag)))) {
 
         @Override
-        protected Handler<Pair<IModelDefinition, Map<String, IFlagInstance>>> identifyHandler(XmlCursor cursor,
+        protected Handler<Pair<IModelDefinition, IFlagContainerBuilder<IFlagInstance>>> identifyHandler(
+            XmlCursor cursor,
             XmlObject obj) {
-          Handler<Pair<IModelDefinition, Map<String, IFlagInstance>>> retval;
+          Handler<Pair<IModelDefinition, IFlagContainerBuilder<IFlagInstance>>> retval;
           if (obj instanceof FlagReferenceType) {
             retval = XmlFlagContainerSupport::handleFlag;
           } else if (obj instanceof InlineFlagDefinitionType) {
@@ -84,146 +87,169 @@ protected Handler<Pair<IModelDefinition, Map<String, IFlagInstance>>> identifyHa
 
   private static void handleFlag( // NOPMD false positive
       @NonNull XmlObject obj,
-      Pair<IModelDefinition, Map<String, IFlagInstance>> state) {
+      Pair<IModelDefinition, IFlagContainerBuilder<IFlagInstance>> state) {
     XmlFlagInstance flagInstance = new XmlFlagInstance(
         (FlagReferenceType) obj,
         ObjectUtils.notNull(state.getLeft()));
-    state.getRight().put(flagInstance.getEffectiveName(), flagInstance);
+    state.getRight().flag(flagInstance);
   }
 
   private static void handleDefineFlag( // NOPMD false positive
       @NonNull XmlObject obj,
-      Pair<IModelDefinition, Map<String, IFlagInstance>> state) {
+      Pair<IModelDefinition, IFlagContainerBuilder<IFlagInstance>> state) {
     XmlInlineFlagDefinition flagInstance = new XmlInlineFlagDefinition(
         (InlineFlagDefinitionType) obj,
         ObjectUtils.notNull(state.getLeft()));
-    state.getRight().put(flagInstance.getEffectiveName(), flagInstance);
-  }
-
-  protected XmlFlagContainerSupport(
-      @NonNull Map<String, IFlagInstance> flagInstanceMap,
-      @Nullable String jsonKeyFlagName) {
-    super(flagInstanceMap,
-        jsonKeyFlagName == null ? null : ObjectUtils.requireNonNull(flagInstanceMap.get(jsonKeyFlagName)));
+    state.getRight().flag(flagInstance);
   }
 
   /**
-   * Generate a set of constraints from the provided XMLBeans instance.
+   * Generate a flag container from the provided XMLBeans instance.
    *
    * @param xmlField
    *          the XMLBeans instance
    * @param container
    *          the field containing the flag
    */
-  public XmlFlagContainerSupport(
+  @SuppressWarnings("PMD.OnlyOneReturn")
+  static IContainerFlagSupport<IFlagInstance> newInstance(
       @NonNull GlobalFieldDefinitionType xmlField,
       @NonNull IFieldDefinition container) {
-    this(
-        xmlField.getFlagList().size() > 0 || xmlField.getDefineFlagList().size() > 0
-            ? parseLocalFlags(xmlField, container)
-            : CollectionUtil.emptyMap(),
-        xmlField.isSetJsonKey() ? xmlField.getJsonKey().getFlagRef() : null);
+    if (!xmlField.getFlagList().isEmpty() || !xmlField.getDefineFlagList().isEmpty()) {
+      IFlagContainerBuilder<IFlagInstance> builder = xmlField.isSetJsonKey()
+          ? IContainerFlagSupport.builder(container.getContainingModule().toFlagQName(
+              ObjectUtils.requireNonNull(xmlField.getJsonKey().getFlagRef())))
+          : IContainerFlagSupport.builder();
+      parseLocalFlags(xmlField, container, builder);
+      return builder.build();
+    }
+    return IContainerFlagSupport.empty();
   }
 
   /**
-   * Generate a set of constraints from the provided XMLBeans instance.
+   * Generate a flag container from the provided XMLBeans instance.
    *
    * @param xmlField
    *          the XMLBeans instance
    * @param container
    *          the field containing the flag
    */
-  public XmlFlagContainerSupport(
+  @SuppressWarnings("PMD.OnlyOneReturn")
+  static IContainerFlagSupport<IFlagInstance> newInstance(
       @NonNull InlineFieldDefinitionType xmlField,
       @NonNull IFieldDefinition container) {
-    this(
-        xmlField.getFlagList().size() > 0 || xmlField.getDefineFlagList().size() > 0
-            ? parseLocalFlags(xmlField, container)
-            : CollectionUtil.emptyMap(),
-        xmlField.isSetJsonKey() ? xmlField.getJsonKey().getFlagRef() : null);
+    if (!xmlField.getFlagList().isEmpty() || !xmlField.getDefineFlagList().isEmpty()) {
+      IFlagContainerBuilder<IFlagInstance> builder = xmlField.isSetJsonKey()
+          ? IContainerFlagSupport.builder(container.getContainingModule().toFlagQName(
+              ObjectUtils.requireNonNull(xmlField.getJsonKey().getFlagRef())))
+          : IContainerFlagSupport.builder();
+      parseLocalFlags(xmlField, container, builder);
+      return builder.build();
+    }
+    return IContainerFlagSupport.empty();
   }
 
   /**
-   * Generate a set of constraints from the provided XMLBeans instance.
+   * Generate a flag container from the provided XMLBeans instance.
    *
    * @param xmlField
    *          the XMLBeans instance
    * @param container
    *          the field containing the flag
    */
-  public XmlFlagContainerSupport(
+  @SuppressWarnings("PMD.OnlyOneReturn")
+  static IContainerFlagSupport<IFlagInstance> newInstance(
       @NonNull GroupedInlineFieldDefinitionType xmlField,
-      @NonNull IFieldDefinition container) {
-    this(
-        xmlField.getFlagList().size() > 0 || xmlField.getDefineFlagList().size() > 0
-            ? parseLocalFlags(xmlField, container)
-            : CollectionUtil.emptyMap(),
-        null);
+      @NonNull IFieldDefinition container,
+      @Nullable String jsonKeyName) {
+    if (!xmlField.getFlagList().isEmpty() || !xmlField.getDefineFlagList().isEmpty()) {
+      IFlagContainerBuilder<IFlagInstance> builder = jsonKeyName == null
+          ? IContainerFlagSupport.builder()
+          : IContainerFlagSupport.builder(container.getContainingModule().toFlagQName(jsonKeyName));
+      parseLocalFlags(xmlField, container, builder);
+      return builder.build();
+    }
+    return IContainerFlagSupport.empty();
   }
 
   /**
-   * Generate a set of constraints from the provided XMLBeans instance.
+   * Generate a flag container from the provided XMLBeans instance.
    *
-   * @param xmlAssembly
+   * @param xmlField
    *          the XMLBeans instance
    * @param container
-   *          the assembly containing the flag
+   *          the field containing the flag
    */
-  public XmlFlagContainerSupport(
+  @SuppressWarnings("PMD.OnlyOneReturn")
+  static IContainerFlagSupport<IFlagInstance> newInstance(
       @NonNull GlobalAssemblyDefinitionType xmlAssembly,
       @NonNull IAssemblyDefinition container) {
-    this(
-        xmlAssembly.getFlagList().size() > 0 || xmlAssembly.getDefineFlagList().size() > 0
-            ? parseLocalFlags(xmlAssembly, container)
-            : CollectionUtil.emptyMap(),
-        xmlAssembly.isSetJsonKey() ? xmlAssembly.getJsonKey().getFlagRef() : null);
+    if (!xmlAssembly.getFlagList().isEmpty() || !xmlAssembly.getDefineFlagList().isEmpty()) {
+      IFlagContainerBuilder<IFlagInstance> builder = xmlAssembly.isSetJsonKey()
+          ? IContainerFlagSupport.builder(container.getContainingModule().toFlagQName(
+              ObjectUtils.requireNonNull(xmlAssembly.getJsonKey().getFlagRef())))
+          : IContainerFlagSupport.builder();
+      parseLocalFlags(xmlAssembly, container, builder);
+      return builder.build();
+    }
+    return IContainerFlagSupport.empty();
   }
 
   /**
-   * Generate a set of constraints from the provided XMLBeans instance.
+   * Generate a flag container from the provided XMLBeans instance.
    *
-   * @param xmlAssembly
+   * @param xmlField
    *          the XMLBeans instance
    * @param container
-   *          the assembly containing the flag
+   *          the field containing the flag
    */
-  public XmlFlagContainerSupport(
+  @SuppressWarnings("PMD.OnlyOneReturn")
+  static IContainerFlagSupport<IFlagInstance> newInstance(
       @NonNull InlineAssemblyDefinitionType xmlAssembly,
       @NonNull IAssemblyDefinition container) {
-    this(
-        xmlAssembly.getFlagList().size() > 0 || xmlAssembly.getDefineFlagList().size() > 0
-            ? parseLocalFlags(xmlAssembly, container)
-            : CollectionUtil.emptyMap(),
-        xmlAssembly.isSetJsonKey() ? xmlAssembly.getJsonKey().getFlagRef() : null);
+    if (!xmlAssembly.getFlagList().isEmpty() || !xmlAssembly.getDefineFlagList().isEmpty()) {
+      IFlagContainerBuilder<IFlagInstance> builder = xmlAssembly.isSetJsonKey()
+          ? IContainerFlagSupport.builder(container.getContainingModule().toFlagQName(
+              ObjectUtils.requireNonNull(xmlAssembly.getJsonKey().getFlagRef())))
+          : IContainerFlagSupport.builder();
+      parseLocalFlags(xmlAssembly, container, builder);
+      return builder.build();
+    }
+    return IContainerFlagSupport.empty();
   }
 
   /**
-   * Generate a set of constraints from the provided XMLBeans instance.
+   * Generate a flag container from the provided XMLBeans instance.
    *
-   * @param xmlAssembly
+   * @param xmlField
    *          the XMLBeans instance
    * @param container
-   *          the assembly containing the flag
+   *          the field containing the flag
    */
-  public XmlFlagContainerSupport(
+  @SuppressWarnings("PMD.OnlyOneReturn")
+  static IContainerFlagSupport<IFlagInstance> newInstance(
       @NonNull GroupedInlineAssemblyDefinitionType xmlAssembly,
-      @NonNull IAssemblyDefinition container) {
-    this(
-        xmlAssembly.getFlagList().size() > 0 || xmlAssembly.getDefineFlagList().size() > 0
-            ? parseLocalFlags(xmlAssembly, container)
-            : CollectionUtil.emptyMap(),
-        null);
+      @NonNull IAssemblyDefinition container,
+      @Nullable String jsonKeyName) {
+    if (!xmlAssembly.getFlagList().isEmpty() || !xmlAssembly.getDefineFlagList().isEmpty()) {
+      IFlagContainerBuilder<IFlagInstance> builder = jsonKeyName == null
+          ? IContainerFlagSupport.builder()
+          : IContainerFlagSupport.builder(container.getContainingModule().toFlagQName(jsonKeyName));
+      parseLocalFlags(xmlAssembly, container, builder);
+      return builder.build();
+    }
+    return IContainerFlagSupport.empty();
   }
 
-  @NonNull
-  private static Map<String, IFlagInstance> parseLocalFlags(
+  private static void parseLocalFlags(
       @NonNull XmlObject xmlObject,
-      @NonNull IModelDefinition parent) {
+      @NonNull IModelDefinition parent,
+      @NonNull IFlagContainerBuilder<IFlagInstance> builder) {
     // handle flags
-    Map<String, IFlagInstance> flagInstances = new LinkedHashMap<>(); // NOPMD - intentional
-
-    XML_MODEL_PARSER.parse(xmlObject, Pair.of(parent, flagInstances));
+    XML_MODEL_PARSER.parse(xmlObject, Pair.of(parent, builder));
+  }
 
-    return flagInstances.isEmpty() ? CollectionUtil.emptyMap() : CollectionUtil.unmodifiableMap(flagInstances);
+  private XmlFlagContainerSupport() {
+    // disable construction
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFlagInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFlagInstance.java
index ad8ba9511..409ee4dc1 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFlagInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlFlagInstance.java
@@ -28,9 +28,8 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractFlagInstance;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
 import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
@@ -46,9 +45,7 @@
 import edu.umd.cs.findbugs.annotations.Nullable;
 
 class XmlFlagInstance
-    extends AbstractInstance<IModelDefinition>
-    implements IFlagInstance,
-    IFeatureDefinitionReferenceInstance<IFlagDefinition, IFlagInstance> {
+    extends AbstractFlagInstance<IModelDefinition, IFlagDefinition, IFlagInstance> {
   @NonNull
   private final FlagReferenceType xmlFlag;
   @Nullable
@@ -63,6 +60,7 @@ class XmlFlagInstance
    * @param parent
    *          the field definition this object is an instance of
    */
+  @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
   public XmlFlagInstance(@NonNull FlagReferenceType xmlObject, @NonNull IModelDefinition parent) {
     super(parent);
     this.xmlFlag = xmlObject;
@@ -71,6 +69,10 @@ public XmlFlagInstance(@NonNull FlagReferenceType xmlObject, @NonNull IModelDefi
         : null; // NOPMD needed for final variable
   }
 
+  // ----------------------------------------
+  // - Start XmlBeans driven code - CPD-OFF -
+  // ----------------------------------------
+
   /**
    * Get the underlying XML data.
    *
@@ -80,22 +82,6 @@ protected final FlagReferenceType getXmlObject() {
     return xmlFlag;
   }
 
-  @Override
-  public final IFlagDefinition getDefinition() {
-    // this should always be not null
-    return ObjectUtils.requireNonNull(
-        getContainingDefinition().getContainingModule().getScopedFlagDefinitionByName(getName()));
-  }
-
-  @Override
-  public final IModelDefinition getContainingDefinition() {
-    return getParentContainer();
-  }
-
-  // ----------------------------------------
-  // - Start XmlBeans driven code - CPD-OFF -
-  // ----------------------------------------
-
   @Override
   public String getFormalName() {
     return getXmlObject().isSetFormalName() ? getXmlObject().getFormalName() : null;
@@ -150,7 +136,7 @@ public MarkupMultiline getRemarks() {
   @Override
   public boolean isRequired() {
     return getXmlObject().isSetRequired() ? getXmlObject().getRequired()
-        : IFlagInstance.DEFAULT_FLAG_REQUIRED;
+        : DEFAULT_FLAG_REQUIRED;
   }
 
   // -------------------------------------
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalAssemblyDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalAssemblyDefinition.java
index 4e0aa165a..81b305036 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalAssemblyDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalAssemblyDefinition.java
@@ -28,19 +28,19 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.AbstractGlobalAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstance;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
 import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
+import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
 import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport;
-import gov.nist.secauto.metaschema.core.model.IDefinition;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerFlag;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerModelAssembly;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
 import gov.nist.secauto.metaschema.core.model.ModuleScopeEnum;
 import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet;
 import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained;
@@ -58,22 +58,22 @@
 
 @SuppressWarnings("PMD.CouplingBetweenObjects")
 class XmlGlobalAssemblyDefinition
-    implements IAssemblyDefinition,
-    IFeatureContainerModelAssembly<
+    extends AbstractGlobalAssemblyDefinition<
+        XmlModule,
+        IAssemblyInstance,
+        IFlagInstance,
         IModelInstanceAbsolute,
         INamedModelInstanceAbsolute,
         IFieldInstanceAbsolute,
         IAssemblyInstanceAbsolute,
         IChoiceInstance,
-        IChoiceGroupInstance>,
-    IFeatureContainerFlag<IFlagInstance> {
+        IChoiceGroupInstance>
+    implements IXmlObjectBinding {
 
   @NonNull
   private final GlobalAssemblyDefinitionType xmlAssembly;
   @NonNull
-  private final XmlModule metaschema;
-  @NonNull
-  private final Lazy<XmlFlagContainerSupport> flagContainer;
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IContainerModelAssemblySupport<
       IModelInstanceAbsolute,
@@ -97,9 +97,9 @@ class XmlGlobalAssemblyDefinition
   public XmlGlobalAssemblyDefinition(
       @NonNull GlobalAssemblyDefinitionType xmlObject,
       @NonNull XmlModule module) {
+    super(module);
     this.xmlAssembly = xmlObject;
-    this.metaschema = module;
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> new XmlFlagContainerSupport(xmlObject, this)));
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> XmlFlagContainerSupport.newInstance(xmlObject, this)));
     this.modelContainer = ObjectUtils.notNull(
         Lazy.lazy(() -> XmlAssemblyModelContainer.of(xmlObject.getModel(), this)));
     this.constraints = ObjectUtils.notNull(Lazy.lazy(() -> {
@@ -113,7 +113,7 @@ public XmlGlobalAssemblyDefinition(
   }
 
   @Override
-  public XmlFlagContainerSupport getFlagContainer() {
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
     return ObjectUtils.notNull(flagContainer.get());
   }
 
@@ -133,16 +133,6 @@ public IModelConstrained getConstraintSupport() {
     return ObjectUtils.notNull(constraints.get());
   }
 
-  @Override
-  public XmlModule getContainingModule() {
-    return metaschema;
-  }
-
-  @Override
-  public IFlagInstance getJsonKeyFlagInstance() {
-    return getFlagContainer().getJsonKeyFlagInstance();
-  }
-
   // ----------------------------------------
   // - Start XmlBeans driven code - CPD-OFF -
   // ----------------------------------------
@@ -152,11 +142,17 @@ public IFlagInstance getJsonKeyFlagInstance() {
    *
    * @return the underlying XML data
    */
+  @Override
   @NonNull
-  protected GlobalAssemblyDefinitionType getXmlObject() {
+  public GlobalAssemblyDefinitionType getXmlObject() {
     return xmlAssembly;
   }
 
+  @Override
+  public IResourceLocation getLocation(Object itemValue) {
+    return null;
+  }
+
   @Override
   public String getName() {
     return ObjectUtils.requireNonNull(getXmlObject().getName());
@@ -226,7 +222,7 @@ public Integer getRootIndex() {
   @SuppressWarnings("null")
   @Override
   public ModuleScopeEnum getModuleScope() {
-    return getXmlObject().isSetScope() ? getXmlObject().getScope() : IDefinition.DEFAULT_DEFINITION_MODEL_SCOPE;
+    return getXmlObject().isSetScope() ? getXmlObject().getScope() : DEFAULT_DEFINITION_MODEL_SCOPE;
   }
 
   @SuppressWarnings("null")
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalFieldDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalFieldDefinition.java
index 815d77183..6494c4b34 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalFieldDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalFieldDefinition.java
@@ -30,10 +30,10 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.model.AbstractGlobalFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
-import gov.nist.secauto.metaschema.core.model.IDefinition;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerFlag;
-import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
+import gov.nist.secauto.metaschema.core.model.IFieldInstance;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.ModuleScopeEnum;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
@@ -47,22 +47,21 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 @SuppressWarnings({ "PMD.GodClass", "PMD.CouplingBetweenObjects" })
 class XmlGlobalFieldDefinition
-    implements IFieldDefinition,
-    IFeatureContainerFlag<IFlagInstance> {
+    extends AbstractGlobalFieldDefinition<XmlModule, IFieldInstance, IFlagInstance> {
   @NonNull
   private final GlobalFieldDefinitionType xmlObject;
-  @NonNull
-  private final XmlModule module;
   @Nullable
   private final Object defaultValue;
   @NonNull
-  private final Lazy<XmlFlagContainerSupport> flagContainer;
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IValueConstrained> constraints;
 
@@ -76,14 +75,14 @@ class XmlGlobalFieldDefinition
    *          the containing Metaschema module
    */
   public XmlGlobalFieldDefinition(@NonNull GlobalFieldDefinitionType xmlObject, @NonNull XmlModule module) {
+    super(module);
     this.xmlObject = xmlObject;
-    this.module = module;
     Object defaultValue = null;
     if (xmlObject.isSetDefault()) {
       defaultValue = getJavaTypeAdapter().parse(ObjectUtils.requireNonNull(xmlObject.getDefault()));
     }
     this.defaultValue = defaultValue;
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> new XmlFlagContainerSupport(xmlObject, this)));
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> XmlFlagContainerSupport.newInstance(xmlObject, this)));
     this.constraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IValueConstrained retval = new ValueConstraintSet();
       if (getXmlObject().isSetConstraint()) {
@@ -101,7 +100,7 @@ public XmlGlobalFieldDefinition(@NonNull GlobalFieldDefinitionType xmlObject, @N
    */
   @SuppressWarnings("null")
   @Override
-  public XmlFlagContainerSupport getFlagContainer() {
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
     return flagContainer.get();
   }
 
@@ -117,21 +116,11 @@ public IValueConstrained getConstraintSupport() {
     return constraints.get();
   }
 
-  @Override
-  public XmlModule getContainingModule() {
-    return module;
-  }
-
   @Override
   public Object getDefaultValue() {
     return defaultValue;
   }
 
-  @Override
-  public IFlagInstance getJsonKeyFlagInstance() {
-    return getFlagContainer().getJsonKeyFlagInstance();
-  }
-
   // ----------------------------------------
   // - Start XmlBeans driven code - CPD-OFF -
   // ----------------------------------------
@@ -206,7 +195,10 @@ public boolean hasJsonValueKeyFlagInstance() {
   public IFlagInstance getJsonValueKeyFlagInstance() {
     IFlagInstance retval = null;
     if (getXmlObject().isSetJsonValueKeyFlag() && getXmlObject().getJsonValueKeyFlag().isSetFlagRef()) {
-      retval = getFlagInstanceByName(ObjectUtils.notNull(getXmlObject().getJsonValueKeyFlag().getFlagRef()));
+      retval = getFlagInstanceByName(
+          new QName(
+              getXmlNamespace(),
+              ObjectUtils.notNull(getXmlObject().getJsonValueKeyFlag().getFlagRef())));
     }
     return retval;
   }
@@ -219,7 +211,7 @@ public String getJsonValueKeyName() {
   @SuppressWarnings("null")
   @Override
   public ModuleScopeEnum getModuleScope() {
-    return getXmlObject().isSetScope() ? getXmlObject().getScope() : IDefinition.DEFAULT_DEFINITION_MODEL_SCOPE;
+    return getXmlObject().isSetScope() ? getXmlObject().getScope() : DEFAULT_DEFINITION_MODEL_SCOPE;
   }
 
   @SuppressWarnings("null")
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalFlagDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalFlagDefinition.java
index a3b5555c2..07f43676a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalFlagDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalFlagDefinition.java
@@ -30,9 +30,9 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.model.AbstractGlobalFlagDefinition;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
-import gov.nist.secauto.metaschema.core.model.IDefinition;
-import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
+import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.ModuleScopeEnum;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained;
@@ -49,11 +49,10 @@
 import edu.umd.cs.findbugs.annotations.Nullable;
 import nl.talsmasoftware.lazy4j.Lazy;
 
-class XmlGlobalFlagDefinition implements IFlagDefinition {
+class XmlGlobalFlagDefinition
+    extends AbstractGlobalFlagDefinition<XmlModule, IFlagInstance> {
   @NonNull
   private final GlobalFlagDefinitionType xmlFlag;
-  @NonNull
-  private final XmlModule module;
   @Nullable
   private final Object defaultValue;
   private final Lazy<IValueConstrained> constraints;
@@ -70,9 +69,8 @@ class XmlGlobalFlagDefinition implements IFlagDefinition {
   public XmlGlobalFlagDefinition(
       @NonNull GlobalFlagDefinitionType xmlFlag,
       @NonNull XmlModule module) {
+    super(module);
     this.xmlFlag = xmlFlag;
-    this.module = module;
-
     Object defaultValue = null;
     if (xmlFlag.isSetDefault()) {
       defaultValue = getJavaTypeAdapter().parse(ObjectUtils.requireNonNull(xmlFlag.getDefault()));
@@ -100,11 +98,6 @@ public IValueConstrained getConstraintSupport() {
     return constraints.get();
   }
 
-  @Override
-  public XmlModule getContainingModule() {
-    return module;
-  }
-
   @Override
   public Object getDefaultValue() {
     return defaultValue;
@@ -126,7 +119,7 @@ protected final GlobalFlagDefinitionType getXmlFlag() {
   @SuppressWarnings("null")
   @Override
   public ModuleScopeEnum getModuleScope() {
-    return getXmlFlag().isSetScope() ? getXmlFlag().getScope() : IDefinition.DEFAULT_DEFINITION_MODEL_SCOPE;
+    return getXmlFlag().isSetScope() ? getXmlFlag().getScope() : DEFAULT_DEFINITION_MODEL_SCOPE;
   }
 
   @SuppressWarnings("null")
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedAssemblyInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedAssemblyInstance.java
index c40234c3a..9894df806 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedAssemblyInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedAssemblyInstance.java
@@ -28,12 +28,11 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractNamedModelInstanceGrouped;
+import gov.nist.secauto.metaschema.core.model.AbstractAssemblyInstance;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.GroupedAssemblyReferenceType;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.UseNameType;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
@@ -45,9 +44,12 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class XmlGroupedAssemblyInstance
-    extends AbstractNamedModelInstanceGrouped
-    implements IAssemblyInstanceGrouped,
-    IFeatureDefinitionReferenceInstance<IAssemblyDefinition, IAssemblyInstanceGrouped> {
+    extends AbstractAssemblyInstance<
+        IChoiceGroupInstance,
+        IAssemblyDefinition,
+        IAssemblyInstanceGrouped,
+        IAssemblyDefinition>
+    implements IAssemblyInstanceGrouped {
   @NonNull
   private final GroupedAssemblyReferenceType xmlObject;
 
@@ -72,16 +74,11 @@ public XmlGroupedAssemblyInstance(
    *
    * @return the underlying XML data
    */
+  @NonNull
   protected GroupedAssemblyReferenceType getXmlObject() {
     return xmlObject;
   }
 
-  @Override
-  public IAssemblyDefinition getDefinition() {
-    // this will always be not null
-    return ObjectUtils.notNull(getContainingModule().getScopedAssemblyDefinitionByName(getName()));
-  }
-
   // ----------------------------------------
   // - Start XmlBeans driven code - CPD-OFF -
   // ----------------------------------------
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedFieldInstance.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedFieldInstance.java
index 32471a5ea..d73189fb3 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedFieldInstance.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedFieldInstance.java
@@ -28,10 +28,10 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractNamedModelInstanceGrouped;
+import gov.nist.secauto.metaschema.core.model.AbstractFieldInstance;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.GroupedFieldReferenceType;
@@ -45,9 +45,8 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class XmlGroupedFieldInstance
-    extends AbstractNamedModelInstanceGrouped
-    implements IFieldInstanceGrouped,
-    IFeatureDefinitionReferenceInstance<IFieldDefinition, IFieldInstanceGrouped> {
+    extends AbstractFieldInstance<IChoiceGroupInstance, IFieldDefinition, IFieldInstanceGrouped, IAssemblyDefinition>
+    implements IFieldInstanceGrouped {
   @NonNull
   private final GroupedFieldReferenceType xmlObject;
 
@@ -68,12 +67,6 @@ public XmlGroupedFieldInstance(
     this.xmlObject = xmlObject;
   }
 
-  @Override
-  public IFieldDefinition getDefinition() {
-    // this will always be not null
-    return ObjectUtils.notNull(getContainingModule().getScopedFieldDefinitionByName(getName()));
-  }
-
   // ----------------------------------------
   // - Start XmlBeans driven code - CPD-OFF -
   // ----------------------------------------
@@ -83,6 +76,7 @@ public IFieldDefinition getDefinition() {
    *
    * @return the underlying XML data
    */
+  @NonNull
   protected GroupedFieldReferenceType getXmlObject() {
     return xmlObject;
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedInlineAssemblyDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedInlineAssemblyDefinition.java
index e0241ef54..43a25750c 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedInlineAssemblyDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedInlineAssemblyDefinition.java
@@ -28,17 +28,15 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractNamedModelInstanceGrouped;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
 import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
+import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
 import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerFlag;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerModelAssembly;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
@@ -57,22 +55,28 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class XmlGroupedInlineAssemblyDefinition
-    extends AbstractNamedModelInstanceGrouped
-    implements IAssemblyInstanceGrouped, IAssemblyDefinition,
-    IFeatureContainerModelAssembly<
+    extends AbstractInlineAssemblyDefinition<
+        IChoiceGroupInstance,
+        IAssemblyDefinition,
+        IAssemblyInstanceGrouped,
+        IAssemblyDefinition,
+        IFlagInstance,
         IModelInstanceAbsolute,
         INamedModelInstanceAbsolute,
         IFieldInstanceAbsolute,
         IAssemblyInstanceAbsolute,
         IChoiceInstance,
-        IChoiceGroupInstance>,
-    IFeatureContainerFlag<IFlagInstance>,
-    IFeatureDefinitionInstanceInlined<IAssemblyDefinition, IAssemblyInstanceGrouped> {
+        IChoiceGroupInstance>
+    implements IAssemblyInstanceGrouped {
+
+  // ----------------------------------------
+  // - Start XmlBeans driven code - CPD-OFF -
+  // ----------------------------------------
 
   @NonNull
   private final GroupedInlineAssemblyDefinitionType xmlObject;
   @NonNull
-  private final Lazy<XmlFlagContainerSupport> flagContainer;
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IContainerModelAssemblySupport<
       IModelInstanceAbsolute,
@@ -99,7 +103,10 @@ public XmlGroupedInlineAssemblyDefinition(
       @NonNull IChoiceGroupInstance parent) {
     super(parent);
     this.xmlObject = xmlObject;
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> new XmlFlagContainerSupport(xmlObject, this)));
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> XmlFlagContainerSupport.newInstance(
+        xmlObject,
+        this,
+        parent.getJsonKeyFlagInstanceName())));
     this.modelContainer = ObjectUtils.notNull(
         Lazy.lazy(() -> XmlAssemblyModelContainer.of(xmlObject.getModel(), this)));
     this.constraints = ObjectUtils.notNull(Lazy.lazy(() -> {
@@ -113,17 +120,7 @@ public XmlGroupedInlineAssemblyDefinition(
   }
 
   @Override
-  public IAssemblyDefinition getDefinition() {
-    return this;
-  }
-
-  @Override
-  public IAssemblyInstanceGrouped getInlineInstance() {
-    return this;
-  }
-
-  @Override
-  public XmlFlagContainerSupport getFlagContainer() {
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
     return ObjectUtils.notNull(flagContainer.get());
   }
 
@@ -144,15 +141,6 @@ public IModelConstrained getConstraintSupport() {
     return ObjectUtils.notNull(constraints.get());
   }
 
-  @Override
-  public IFlagInstance getJsonKeyFlagInstance() {
-    return getFlagContainer().getJsonKeyFlagInstance();
-  }
-
-  // ----------------------------------------
-  // - Start XmlBeans driven code - CPD-OFF -
-  // ----------------------------------------
-
   /**
    * Get the underlying XML model.
    *
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedInlineFieldDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedInlineFieldDefinition.java
index 34b76cae8..739e2d619 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedInlineFieldDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGroupedInlineFieldDefinition.java
@@ -30,11 +30,11 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractNamedModelInstanceGrouped;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerFlag;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
+import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
@@ -48,19 +48,24 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class XmlGroupedInlineFieldDefinition
-    extends AbstractNamedModelInstanceGrouped
-    implements IFieldInstanceGrouped, IFieldDefinition,
-    IFeatureDefinitionInstanceInlined<IFieldDefinition, IFieldInstanceGrouped>,
-    IFeatureContainerFlag<IFlagInstance> {
+    extends AbstractInlineFieldDefinition<
+        IChoiceGroupInstance,
+        IFieldDefinition,
+        IFieldInstanceGrouped,
+        IAssemblyDefinition,
+        IFlagInstance>
+    implements IFieldInstanceGrouped {
 
   @NonNull
   private final GroupedInlineFieldDefinitionType xmlObject;
   @NonNull
-  private final Lazy<XmlFlagContainerSupport> flagContainer;
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IValueConstrained> constraints;
 
@@ -79,7 +84,10 @@ public XmlGroupedInlineFieldDefinition(
       @NonNull IChoiceGroupInstance parent) {
     super(parent);
     this.xmlObject = xmlObject;
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> new XmlFlagContainerSupport(xmlObject, this)));
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> XmlFlagContainerSupport.newInstance(
+        xmlObject,
+        this,
+        parent.getJsonKeyFlagInstanceName())));
     this.constraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IValueConstrained retval = new ValueConstraintSet();
       if (getXmlObject().isSetConstraint()) {
@@ -91,17 +99,7 @@ public XmlGroupedInlineFieldDefinition(
   }
 
   @Override
-  public IFieldDefinition getDefinition() {
-    return this;
-  }
-
-  @Override
-  public XmlGroupedInlineFieldDefinition getInlineInstance() {
-    return this;
-  }
-
-  @Override
-  public XmlFlagContainerSupport getFlagContainer() {
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
     return ObjectUtils.notNull(flagContainer.get());
   }
 
@@ -110,10 +108,6 @@ public IValueConstrained getConstraintSupport() {
     return ObjectUtils.notNull(constraints.get());
   }
 
-  @Override
-  public IFlagInstance getJsonKeyFlagInstance() {
-    return getFlagContainer().getJsonKeyFlagInstance();
-  }
   // ----------------------------------------
   // - Start XmlBeans driven code - CPD-OFF -
   // ----------------------------------------
@@ -181,7 +175,10 @@ public boolean hasJsonValueKeyFlagInstance() {
   public IFlagInstance getJsonValueKeyFlagInstance() {
     IFlagInstance retval = null;
     if (getXmlObject().isSetJsonValueKeyFlag() && getXmlObject().getJsonValueKeyFlag().isSetFlagRef()) {
-      retval = getFlagInstanceByName(ObjectUtils.notNull(getXmlObject().getJsonValueKeyFlag().getFlagRef()));
+      retval = getFlagInstanceByName(
+          new QName(
+              getXmlNamespace(),
+              ObjectUtils.notNull(getXmlObject().getJsonValueKeyFlag().getFlagRef())));
     }
     return retval;
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineAssemblyDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineAssemblyDefinition.java
index c7ea0532d..af3d1fd92 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineAssemblyDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineAssemblyDefinition.java
@@ -28,17 +28,15 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
 import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
+import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
 import gov.nist.secauto.metaschema.core.model.IContainerModel;
 import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerFlag;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerModelAssembly;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
@@ -62,21 +60,28 @@
  * Represents a Metaschema assembly definition declared locally as an instance.
  */
 class XmlInlineAssemblyDefinition
-    extends AbstractInstance<IContainerModel>
-    implements IAssemblyInstanceAbsolute, IAssemblyDefinition,
-    IFeatureContainerModelAssembly<
+    extends AbstractInlineAssemblyDefinition<
+        IContainerModel,
+        IAssemblyDefinition,
+        IAssemblyInstanceAbsolute,
+        IAssemblyDefinition,
+        IFlagInstance,
         IModelInstanceAbsolute,
         INamedModelInstanceAbsolute,
         IFieldInstanceAbsolute,
         IAssemblyInstanceAbsolute,
         IChoiceInstance,
-        IChoiceGroupInstance>,
-    IFeatureContainerFlag<IFlagInstance>,
-    IFeatureDefinitionInstanceInlined<IAssemblyDefinition, IAssemblyInstanceAbsolute> {
+        IChoiceGroupInstance>
+    implements IAssemblyInstanceAbsolute {
+
+  // ----------------------------------------
+  // - Start XmlBeans driven code - CPD-OFF -
+  // ----------------------------------------
+
   @NonNull
   private final InlineAssemblyDefinitionType xmlObject;
   @NonNull
-  private final Lazy<XmlFlagContainerSupport> flagContainer;
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IContainerModelAssemblySupport<
       IModelInstanceAbsolute,
@@ -102,7 +107,7 @@ public XmlInlineAssemblyDefinition(
       @NonNull IContainerModel parent) {
     super(parent);
     this.xmlObject = xmlObject;
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> new XmlFlagContainerSupport(xmlObject, this)));
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> XmlFlagContainerSupport.newInstance(xmlObject, this)));
     this.modelContainer
         = ObjectUtils.notNull(Lazy.lazy(() -> XmlAssemblyModelContainer.of(xmlObject.getModel(), this)));
     this.constraints = ObjectUtils.notNull(Lazy.lazy(() -> {
@@ -115,20 +120,9 @@ public XmlInlineAssemblyDefinition(
     }));
   }
 
-  @Override
-  public IAssemblyDefinition getDefinition() {
-    return this;
-  }
-
-  @Override
-  @NonNull
-  public IAssemblyInstanceAbsolute getInlineInstance() {
-    return this;
-  }
-
   @SuppressWarnings("null")
   @Override
-  public XmlFlagContainerSupport getFlagContainer() {
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
     return flagContainer.get();
   }
 
@@ -150,15 +144,6 @@ public IModelConstrained getConstraintSupport() {
     return constraints.get();
   }
 
-  @Override
-  public IFlagInstance getJsonKeyFlagInstance() {
-    return getFlagContainer().getJsonKeyFlagInstance();
-  }
-
-  // ----------------------------------------
-  // - Start XmlBeans driven code - CPD-OFF -
-  // ----------------------------------------
-
   /**
    * Get the underlying XML model.
    *
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineFieldDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineFieldDefinition.java
index f62d9710d..a2029c40a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineFieldDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineFieldDefinition.java
@@ -30,11 +30,11 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
+import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
 import gov.nist.secauto.metaschema.core.model.IContainerModel;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerFlag;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
@@ -50,21 +50,26 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 class XmlInlineFieldDefinition
-    extends AbstractInstance<IContainerModel>
-    implements IFieldInstanceAbsolute, IFieldDefinition,
-    IFeatureContainerFlag<IFlagInstance>,
-    IFeatureDefinitionInstanceInlined<IFieldDefinition, IFieldInstanceAbsolute> {
+    extends AbstractInlineFieldDefinition<
+        IContainerModel,
+        IFieldDefinition,
+        IFieldInstanceAbsolute,
+        IAssemblyDefinition,
+        IFlagInstance>
+    implements IFieldInstanceAbsolute {
   @NonNull
   private final InlineFieldDefinitionType xmlObject;
   @Nullable
   private final Object defaultValue;
   @NonNull
-  private final Lazy<XmlFlagContainerSupport> flagContainer;
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IValueConstrained> constraints;
 
@@ -86,7 +91,7 @@ public XmlInlineFieldDefinition(
     this.defaultValue = xmlObject.isSetDefault()
         ? getJavaTypeAdapter().parse(ObjectUtils.requireNonNull(xmlObject.getDefault()))
         : null;
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> new XmlFlagContainerSupport(xmlObject, this)));
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> XmlFlagContainerSupport.newInstance(xmlObject, this)));
     this.constraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IValueConstrained retval = new ValueConstraintSet();
       if (getXmlObject().isSetConstraint()) {
@@ -111,28 +116,12 @@ protected final InlineFieldDefinitionType getXmlObject() {
     return xmlObject;
   }
 
-  @Override
-  public IFieldDefinition getDefinition() {
-    return this;
-  }
-
-  @Override
-  @NonNull
-  public IFieldInstanceAbsolute getInlineInstance() {
-    return this;
-  }
-
   @SuppressWarnings("null")
   @Override
-  public XmlFlagContainerSupport getFlagContainer() {
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
     return flagContainer.get();
   }
 
-  @Override
-  public IFlagInstance getJsonKeyFlagInstance() {
-    return getFlagContainer().getJsonKeyFlagInstance();
-  }
-
   /**
    * Used to generate the instances for the constraints in a lazy fashion when the
    * constraints are first accessed.
@@ -229,7 +218,10 @@ public boolean hasJsonValueKeyFlagInstance() {
   public IFlagInstance getJsonValueKeyFlagInstance() {
     IFlagInstance retval = null;
     if (getXmlObject().isSetJsonValueKeyFlag() && getXmlObject().getJsonValueKeyFlag().isSetFlagRef()) {
-      retval = getFlagInstanceByName(ObjectUtils.notNull(getXmlObject().getJsonValueKeyFlag().getFlagRef()));
+      retval = getFlagInstanceByName(
+          new QName(
+              getXmlNamespace(),
+              ObjectUtils.notNull(getXmlObject().getJsonValueKeyFlag().getFlagRef())));
     }
     return retval;
   }
@@ -239,6 +231,11 @@ public String getJsonValueKeyName() {
     return getXmlObject().getJsonValueKey();
   }
 
+  // @Override
+  // public String getJsonKeyFlagInstanceName() {
+  // return IFeatureXmlContainerFlag.super.getJsonKeyFlagInstanceName();
+  // }
+
   // -------------------------------------
   // - End XmlBeans driven code - CPD-ON -
   // -------------------------------------
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineFlagDefinition.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineFlagDefinition.java
index 00702587b..f4d0ee94f 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineFlagDefinition.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlInlineFlagDefinition.java
@@ -30,9 +30,8 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.AbstractInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineFlagDefinition;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
 import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
@@ -51,9 +50,8 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 class XmlInlineFlagDefinition
-    extends AbstractInstance<IModelDefinition>
-    implements IFlagInstance, IFlagDefinition,
-    IFeatureDefinitionInstanceInlined<IFlagDefinition, IFlagInstance> {
+    extends AbstractInlineFlagDefinition<IModelDefinition, IFlagDefinition, IFlagInstance> {
+
   @NonNull
   private final InlineFlagDefinitionType xmlFlag;
   @Nullable
@@ -88,17 +86,6 @@ public XmlInlineFlagDefinition(@NonNull InlineFlagDefinitionType xmlObject, @Non
     }));
   }
 
-  @Override
-  public IFlagDefinition getDefinition() {
-    return this;
-  }
-
-  @Override
-  @NonNull
-  public IFlagInstance getInlineInstance() {
-    return this;
-  }
-
   /**
    * Used to generate the instances for the constraints in a lazy fashion when the
    * constraints are first accessed.
@@ -114,11 +101,6 @@ public Object getDefaultValue() {
     return defaultValue;
   }
 
-  @Override
-  public IModelDefinition getContainingDefinition() {
-    return getParentContainer();
-  }
-
   // ----------------------------------------
   // - Start XmlBeans driven code - CPD-OFF -
   // ----------------------------------------
@@ -168,8 +150,7 @@ public Integer getIndex() {
 
   @Override
   public boolean isRequired() {
-    return getXmlObject().isSetRequired() ? getXmlObject().getRequired()
-        : IFlagInstance.DEFAULT_FLAG_REQUIRED;
+    return getXmlObject().isSetRequired() ? getXmlObject().getRequired() : DEFAULT_FLAG_REQUIRED;
   }
 
   @SuppressWarnings("null")
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlModelParser.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlModelParser.java
index 830333a7b..c82b98d58 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlModelParser.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlModelParser.java
@@ -43,6 +43,13 @@ private XmlModelParser() {
     // disable construction
   }
 
+  /**
+   * Get the group-as/@in-json value based on the XMLBeans representation.
+   *
+   * @param groupAs
+   *          the XMLBeans value
+   * @return the in-json value
+   */
   @NonNull
   public static JsonGroupAsBehavior getJsonGroupAsBehavior(@Nullable GroupAsType groupAs) {
     JsonGroupAsBehavior retval = IGroupable.DEFAULT_JSON_GROUP_AS_BEHAVIOR;
@@ -52,6 +59,13 @@ public static JsonGroupAsBehavior getJsonGroupAsBehavior(@Nullable GroupAsType g
     return retval;
   }
 
+  /**
+   * Get the group-as/@in-xml value based on the XMLBeans representation.
+   *
+   * @param groupAs
+   *          the XMLBeans value
+   * @return the in-xml value
+   */
   @NonNull
   public static XmlGroupAsBehavior getXmlGroupAsBehavior(@Nullable GroupAsType groupAs) {
     XmlGroupAsBehavior retval = IGroupable.DEFAULT_XML_GROUP_AS_BEHAVIOR;
@@ -61,6 +75,13 @@ public static XmlGroupAsBehavior getXmlGroupAsBehavior(@Nullable GroupAsType gro
     return retval;
   }
 
+  /**
+   * Convert the XMLBeans max occurrence to an integer value.
+   *
+   * @param value
+   *          the XMLBeans value
+   * @return the integer value
+   */
   public static int getMinOccurs(@Nullable BigInteger value) {
     int retval = IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS;
     if (value != null) {
@@ -69,11 +90,20 @@ public static int getMinOccurs(@Nullable BigInteger value) {
     return retval;
   }
 
+  /**
+   * Convert the XMLBeans max occurrence to an integer value.
+   * <p>
+   * If the source value is "unbounded", the the value {@code -1} is used.
+   *
+   * @param value
+   *          the XMLBeans value
+   * @return the integer value
+   */
   public static int getMaxOccurs(@Nullable Object value) {
     int retval = IGroupable.DEFAULT_GROUP_AS_MAX_OCCURS;
     if (value != null) {
       if (value instanceof String) {
-        // unbounded
+        // must be "unbounded"
         retval = -1;
       } else if (value instanceof BigInteger) {
         retval = ((BigInteger) value).intValueExact();
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlModule.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlModule.java
index f5e791e8b..ad0025873 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlModule.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlModule.java
@@ -32,9 +32,9 @@
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
-import gov.nist.secauto.metaschema.core.model.xml.IXmlModule;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.GlobalAssemblyDefinitionType;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.GlobalFieldDefinitionType;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.GlobalFlagDefinitionType;
@@ -53,30 +53,31 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
+import nl.talsmasoftware.lazy4j.Lazy;
 
 @SuppressWarnings("PMD.CouplingBetweenObjects")
 public class XmlModule
     extends AbstractModule<
-        IXmlModule,
+        IMetaschemaModule,
         IModelDefinition,
         IFlagDefinition,
         IFieldDefinition,
         IAssemblyDefinition>
-    implements IXmlModule {
+    implements IMetaschemaModule {
   private static final Logger LOGGER = LogManager.getLogger(XmlModule.class);
 
   @NonNull
   private final URI location;
   @NonNull
   private final METASCHEMADocument module;
-  private final Map<String, IFlagDefinition> flagDefinitions;
-  private final Map<String, IFieldDefinition> fieldDefinitions;
-  private final Map<String, IAssemblyDefinition> assemblyDefinitions;
-  private final Map<String, IAssemblyDefinition> rootAssemblyDefinitions;
+  private final Lazy<Definitions> definitions;
 
   /**
    * Constructs a new Metaschema instance.
@@ -93,81 +94,13 @@ public class XmlModule
   public XmlModule( // NOPMD - unavoidable
       @NonNull URI resource,
       @NonNull METASCHEMADocument moduleXml,
-      @NonNull List<IXmlModule> importedModules) throws MetaschemaException {
+      @NonNull List<? extends IMetaschemaModule> importedModules) throws MetaschemaException {
     super(importedModules);
     this.location = ObjectUtils.requireNonNull(resource, "resource");
     Objects.requireNonNull(moduleXml.getMETASCHEMA());
     this.module = moduleXml;
 
-    METASCHEMA metaschemaNode = module.getMETASCHEMA();
-
-    // handle definitions in this module
-    // TODO: switch implementation to use the XmlObjectParser
-    {
-      // start with flag definitions
-      try (XmlCursor cursor = metaschemaNode.newCursor()) {
-        cursor.selectPath("declare namespace m='http://csrc.nist.gov/ns/oscal/metaschema/1.0';$this/m:define-flag");
-
-        Map<String, IFlagDefinition> flagDefinitions = new LinkedHashMap<>(); // NOPMD - intentional
-        while (cursor.toNextSelection()) {
-          GlobalFlagDefinitionType obj = ObjectUtils.notNull((GlobalFlagDefinitionType) cursor.getObject());
-          XmlGlobalFlagDefinition flag = new XmlGlobalFlagDefinition(obj, this); // NOPMD - intentional
-          if (LOGGER.isTraceEnabled()) {
-            LOGGER.trace("New flag definition '{}'", flag.toCoordinates());
-          }
-          flagDefinitions.put(flag.getName(), flag);
-        }
-        this.flagDefinitions
-            = flagDefinitions.isEmpty() ? Collections.emptyMap() : Collections.unmodifiableMap(flagDefinitions);
-      }
-    }
-
-    {
-      // now field definitions
-      try (XmlCursor cursor = metaschemaNode.newCursor()) {
-        cursor.selectPath("declare namespace m='http://csrc.nist.gov/ns/oscal/metaschema/1.0';$this/m:define-field");
-
-        Map<String, IFieldDefinition> fieldDefinitions = new LinkedHashMap<>(); // NOPMD - intentional
-        while (cursor.toNextSelection()) {
-          GlobalFieldDefinitionType obj = ObjectUtils.notNull((GlobalFieldDefinitionType) cursor.getObject());
-          XmlGlobalFieldDefinition field = new XmlGlobalFieldDefinition(obj, this); // NOPMD - intentional
-          if (LOGGER.isTraceEnabled()) {
-            LOGGER.trace("New field definition '{}'", field.toCoordinates());
-          }
-          fieldDefinitions.put(field.getName(), field);
-        }
-        this.fieldDefinitions
-            = fieldDefinitions.isEmpty() ? Collections.emptyMap() : Collections.unmodifiableMap(fieldDefinitions);
-      }
-    }
-
-    {
-      // finally assembly definitions
-      Map<String, IAssemblyDefinition> assemblyDefinitions = new LinkedHashMap<>(); // NOPMD - intentional
-      Map<String, IAssemblyDefinition> rootAssemblyDefinitions = new LinkedHashMap<>(); // NOPMD - intentional
-
-      try (XmlCursor cursor = metaschemaNode.newCursor()) {
-        cursor.selectPath(
-            "declare namespace m='http://csrc.nist.gov/ns/oscal/metaschema/1.0';$this/m:define-assembly");
-
-        while (cursor.toNextSelection()) {
-          GlobalAssemblyDefinitionType obj = ObjectUtils.notNull((GlobalAssemblyDefinitionType) cursor.getObject());
-          XmlGlobalAssemblyDefinition assembly = new XmlGlobalAssemblyDefinition(obj, this); // NOPMD - intentional
-          if (LOGGER.isTraceEnabled()) {
-            LOGGER.trace("New assembly definition '{}'", assembly.toCoordinates());
-          }
-          assemblyDefinitions.put(assembly.getName(), assembly);
-          if (assembly.isRoot()) {
-            rootAssemblyDefinitions.put(ObjectUtils.notNull(assembly.getRootName()), assembly);
-          }
-        }
-
-        this.assemblyDefinitions
-            = assemblyDefinitions.isEmpty() ? Collections.emptyMap() : Collections.unmodifiableMap(assemblyDefinitions);
-        this.rootAssemblyDefinitions = rootAssemblyDefinitions.isEmpty() ? Collections.emptyMap()
-            : Collections.unmodifiableMap(rootAssemblyDefinitions);
-      }
-    }
+    this.definitions = Lazy.lazy(() -> new Definitions(ObjectUtils.requireNonNull(module.getMETASCHEMA())));
   }
 
   @NonNull
@@ -223,34 +156,31 @@ public URI getJsonBaseUri() {
     return URI.create(getXmlModule().getJsonBaseUri());
   }
 
-  private Map<String, IAssemblyDefinition> getAssemblyDefinitionMap() {
-    return assemblyDefinitions;
+  @NonNull
+  private Definitions getDefinitions() {
+    return ObjectUtils.notNull(definitions.get());
   }
 
   @SuppressWarnings("null")
   @Override
   public Collection<IAssemblyDefinition> getAssemblyDefinitions() {
-    return getAssemblyDefinitionMap().values();
+    return getDefinitions().getAssemblyDefinitionMap().values();
   }
 
   @Override
-  public IAssemblyDefinition getAssemblyDefinitionByName(@NonNull String name) {
-    return getAssemblyDefinitionMap().get(name);
-  }
-
-  private Map<String, IFieldDefinition> getFieldDefinitionMap() {
-    return fieldDefinitions;
+  public IAssemblyDefinition getAssemblyDefinitionByName(@NonNull QName name) {
+    return getDefinitions().getAssemblyDefinitionMap().get(name);
   }
 
   @SuppressWarnings("null")
   @Override
   public Collection<IFieldDefinition> getFieldDefinitions() {
-    return getFieldDefinitionMap().values();
+    return getDefinitions().getFieldDefinitionMap().values();
   }
 
   @Override
-  public IFieldDefinition getFieldDefinitionByName(@NonNull String name) {
-    return getFieldDefinitionMap().get(name);
+  public IFieldDefinition getFieldDefinitionByName(@NonNull QName name) {
+    return getDefinitions().getFieldDefinitionMap().get(name);
   }
 
   @SuppressWarnings("null")
@@ -260,28 +190,154 @@ public List<IModelDefinition> getAssemblyAndFieldDefinitions() {
         .collect(Collectors.toList());
   }
 
-  private Map<String, IFlagDefinition> getFlagDefinitionMap() {
-    return flagDefinitions;
-  }
-
   @SuppressWarnings("null")
   @Override
   public Collection<IFlagDefinition> getFlagDefinitions() {
-    return getFlagDefinitionMap().values();
+    return getDefinitions().getFlagDefinitionMap().values();
   }
 
   @Override
-  public IFlagDefinition getFlagDefinitionByName(@NonNull String name) {
-    return getFlagDefinitionMap().get(name);
-  }
-
-  private Map<String, ? extends IAssemblyDefinition> getRootAssemblyDefinitionMap() {
-    return rootAssemblyDefinitions;
+  public IFlagDefinition getFlagDefinitionByName(@NonNull QName name) {
+    return getDefinitions().getFlagDefinitionMap().get(name);
   }
 
   @SuppressWarnings("null")
   @Override
   public Collection<? extends IAssemblyDefinition> getRootAssemblyDefinitions() {
-    return getRootAssemblyDefinitionMap().values();
+    return getDefinitions().getRootAssemblyDefinitionMap().values();
+  }
+
+  private final class Definitions {
+    private final Map<QName, IFlagDefinition> flagDefinitions;
+    private final Map<QName, IFieldDefinition> fieldDefinitions;
+    private final Map<QName, IAssemblyDefinition> assemblyDefinitions;
+    private final Map<QName, IAssemblyDefinition> rootAssemblyDefinitions;
+
+    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
+    private Definitions(@NonNull METASCHEMA metaschemaNode) {
+
+      // handle definitions in this module
+      // TODO: switch implementation to use the XmlObjectParser
+      try (XmlCursor cursor = metaschemaNode.newCursor()) {
+        assert cursor != null;
+
+        this.flagDefinitions = parseFlags(cursor);
+        this.fieldDefinitions = parseFields(cursor);
+        this.assemblyDefinitions = parseAssemblies(cursor);
+        this.rootAssemblyDefinitions = this.assemblyDefinitions.isEmpty()
+            ? Collections.emptyMap()
+            : Collections.unmodifiableMap(this.assemblyDefinitions.values().stream()
+                .filter(IAssemblyDefinition::isRoot)
+                .collect(Collectors.toMap(
+                    IAssemblyDefinition::getRootXmlQName,
+                    Function.identity(),
+                    (v1, v2) -> {
+                      throw new IllegalStateException(
+                          String.format("Duplicate root QName '%s' for root assemblies: %s and %s.",
+                              v1.getName(),
+                              v2.getName()));
+                    },
+                    LinkedHashMap::new)));
+      }
+    }
+
+    @SuppressWarnings({
+        "PMD.UseConcurrentHashMap",
+        "PMD.AvoidInstantiatingObjectsInLoops"
+    })
+    private Map<QName, IFlagDefinition> parseFlags(@NonNull XmlCursor cursor) {
+      cursor.push();
+
+      // start with flag definitions
+      cursor.selectPath("declare namespace m='http://csrc.nist.gov/ns/oscal/metaschema/1.0';$this/m:define-flag");
+
+      Map<QName, IFlagDefinition> flags = new LinkedHashMap<>();
+      while (cursor.toNextSelection()) {
+        GlobalFlagDefinitionType obj = ObjectUtils.notNull((GlobalFlagDefinitionType) cursor.getObject());
+        XmlGlobalFlagDefinition flag = new XmlGlobalFlagDefinition(obj, XmlModule.this);
+        if (LOGGER.isTraceEnabled()) {
+          LOGGER.trace("New flag definition '{}'", flag.toCoordinates());
+        }
+        flags.put(flag.getDefinitionQName(), flag);
+      }
+
+      cursor.pop();
+
+      return flags.isEmpty()
+          ? Collections.emptyMap()
+          : Collections.unmodifiableMap(flags);
+    }
+
+    @SuppressWarnings({
+        "PMD.UseConcurrentHashMap",
+        "PMD.AvoidInstantiatingObjectsInLoops"
+    })
+    private Map<QName, IFieldDefinition> parseFields(@NonNull XmlCursor cursor) {
+      cursor.push();
+
+      // now field definitions
+      cursor.selectPath("declare namespace m='http://csrc.nist.gov/ns/oscal/metaschema/1.0';$this/m:define-field");
+
+      Map<QName, IFieldDefinition> fields = new LinkedHashMap<>();
+      while (cursor.toNextSelection()) {
+        GlobalFieldDefinitionType obj = ObjectUtils.notNull((GlobalFieldDefinitionType) cursor.getObject());
+        XmlGlobalFieldDefinition field = new XmlGlobalFieldDefinition(obj, XmlModule.this);
+        if (LOGGER.isTraceEnabled()) {
+          LOGGER.trace("New field definition '{}'", field.toCoordinates());
+        }
+        fields.put(field.getDefinitionQName(), field);
+      }
+
+      cursor.pop();
+
+      return fields.isEmpty()
+          ? Collections.emptyMap()
+          : Collections.unmodifiableMap(fields);
+    }
+
+    @SuppressWarnings({
+        "PMD.UseConcurrentHashMap",
+        "PMD.AvoidInstantiatingObjectsInLoops"
+    })
+    private Map<QName, IAssemblyDefinition> parseAssemblies(XmlCursor cursor) {
+      cursor.push();
+
+      // finally assembly definitions
+      cursor.selectPath(
+          "declare namespace m='http://csrc.nist.gov/ns/oscal/metaschema/1.0';$this/m:define-assembly");
+
+      Map<QName, IAssemblyDefinition> assemblies = new LinkedHashMap<>();
+      while (cursor.toNextSelection()) {
+        GlobalAssemblyDefinitionType obj = ObjectUtils.notNull((GlobalAssemblyDefinitionType) cursor.getObject());
+        XmlGlobalAssemblyDefinition assembly = new XmlGlobalAssemblyDefinition(obj, XmlModule.this);
+        if (LOGGER.isTraceEnabled()) {
+          LOGGER.trace("New assembly definition '{}'", assembly.toCoordinates());
+        }
+        assemblies.put(assembly.getDefinitionQName(), assembly);
+      }
+
+      cursor.pop();
+
+      return assemblies.isEmpty()
+          ? Collections.emptyMap()
+          : Collections.unmodifiableMap(assemblies);
+    }
+
+    public Map<QName, IFlagDefinition> getFlagDefinitionMap() {
+      return flagDefinitions;
+    }
+
+    public Map<QName, IFieldDefinition> getFieldDefinitionMap() {
+      return fieldDefinitions;
+    }
+
+    public Map<QName, IAssemblyDefinition> getAssemblyDefinitionMap() {
+      return assemblyDefinitions;
+    }
+
+    public Map<QName, ? extends IAssemblyDefinition> getRootAssemblyDefinitionMap() {
+      return rootAssemblyDefinitions;
+    }
+
   }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlObjectParser.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlObjectParser.java
index 6dc871b1d..dd4f67e35 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlObjectParser.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlObjectParser.java
@@ -46,6 +46,14 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
+/**
+ * Supports parsing Metaschema assembly and field XMLBeans objects that contain
+ * other Metaschema objects.
+ *
+ * @param <T>
+ *          the Java type of the state that is passed to the element parsing
+ *          handlers
+ */
 public class XmlObjectParser<T> {
   private static final XmlOptions XML_OPTIONS = new XmlOptions().setXPathUseSaxon(false).setXPathUseXmlBeans(true);
   private final Map<QName, Handler<T>> elementNameToHandlerMap;
@@ -55,7 +63,7 @@ private static String generatePath(@NonNull Collection<QName> nodes) {
     // build a mapping of namespace prefix to namespace
     AtomicInteger count = new AtomicInteger();
     Map<String, String> namespaceToPrefixMap = nodes.stream()
-        .map(qname -> qname.getNamespaceURI())
+        .map(QName::getNamespaceURI)
         .distinct()
         .map(ns -> Pair.of(ns, "m" + count.getAndIncrement()))
         .collect(Collectors.toMap(
@@ -107,12 +115,26 @@ private String getXpath() {
     return xpath;
   }
 
+  /**
+   * Get the resource location of the provided object.
+   *
+   * @param obj
+   *          the XMLBeans object to get the location for
+   * @return the resource location or {@code null} if the location is not known
+   */
   @SuppressWarnings({ "resource", "null" })
   @Nullable
   public static String toLocation(@NonNull XmlObject obj) {
     return toLocation(obj.newCursor());
   }
 
+  /**
+   * Get the resource location of the provided cursor.
+   *
+   * @param cursor
+   *          the XMLBeans cursor to get the location for
+   * @return the resource location or {@code null} if the location is not known
+   */
   @Nullable
   public static String toLocation(@NonNull XmlCursor cursor) {
     String retval = null;
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlbeansMarkupVisitor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlbeansMarkupVisitor.java
index 010844bec..9d0ab5db5 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlbeansMarkupVisitor.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlbeansMarkupVisitor.java
@@ -29,10 +29,10 @@
 import com.vladsch.flexmark.parser.ListOptions;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.IMarkupString;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.AbstractMarkupWriter;
 import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.IMarkupVisitor;
 import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.IMarkupWriter;
 import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.MarkupVisitor;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.impl.AbstractMarkupWriter;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import org.apache.xmlbeans.XmlCursor;
@@ -106,11 +106,11 @@ protected XmlbeansMarkupVisitor(
   @Override
   public void writeEmptyElement(QName qname, Map<String, String> attributes)
       throws IllegalArgumentException {
-    @SuppressWarnings("resource") // not owned
+    @SuppressWarnings({ "resource", "PMD.CloseResource" }) // not owned
     XmlCursor cursor = getStream();
     cursor.beginElement(qname);
 
-    attributes.forEach((name, value) -> cursor.insertAttributeWithValue(name, value));
+    attributes.forEach(cursor::insertAttributeWithValue);
 
     // go to the end of the new element
     cursor.toEndToken();
@@ -122,11 +122,11 @@ public void writeEmptyElement(QName qname, Map<String, String> attributes)
   @Override
   public void writeElementStart(QName qname, Map<String, String> attributes)
       throws IllegalArgumentException {
-    @SuppressWarnings("resource") // not owned
+    @SuppressWarnings({ "resource", "PMD.CloseResource" }) // not owned
     XmlCursor cursor = getStream();
     cursor.beginElement(qname);
 
-    attributes.forEach((name, value) -> cursor.insertAttributeWithValue(name, value));
+    attributes.forEach(cursor::insertAttributeWithValue);
 
     // save the current location state
     cursor.push();
@@ -134,7 +134,7 @@ public void writeElementStart(QName qname, Map<String, String> attributes)
 
   @Override
   public void writeElementEnd(QName qname) throws IllegalArgumentException {
-    @SuppressWarnings("resource") // not owned
+    @SuppressWarnings({ "resource", "PMD.CloseResource" }) // not owned
     XmlCursor cursor = getStream();
 
     // restore location to end of start element
@@ -149,14 +149,14 @@ public void writeElementEnd(QName qname) throws IllegalArgumentException {
 
   @Override
   public void writeText(CharSequence text) throws IllegalArgumentException {
-    @SuppressWarnings("resource") // not owned
+    @SuppressWarnings({ "resource", "PMD.CloseResource" }) // not owned
     XmlCursor cursor = getStream();
     cursor.insertChars(text.toString());
   }
 
   @Override
   protected void writeComment(CharSequence text) throws IllegalArgumentException {
-    @SuppressWarnings("resource") // not owned
+    @SuppressWarnings({ "resource", "PMD.CloseResource" }) // not owned
     XmlCursor cursor = getStream();
     cursor.insertComment(text.toString());
   }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/ConstraintLevelType.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/ConstraintLevelType.java
index 13f61a9a0..7570cd61a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/ConstraintLevelType.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/ConstraintLevelType.java
@@ -56,6 +56,9 @@ public static void encodeConstraintLevelType(IConstraint.Level obj, org.apache.x
       case INFORMATIONAL:
         target.setStringValue("INFORMATIONAL");
         break;
+      case DEBUG:
+        target.setStringValue("DEBUG");
+        break;
       default:
         throw new UnsupportedOperationException(obj.name());
       }
@@ -85,6 +88,9 @@ public static IConstraint.Level decodeConstraintLevelType(org.apache.xmlbeans.Si
     case "INFORMATIONAL":
       retval = IConstraint.Level.INFORMATIONAL;
       break;
+    case "DEBUG":
+      retval = IConstraint.Level.DEBUG;
+      break;
     default:
       throw new UnsupportedOperationException(value);
     }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/DatatypesHandler.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/DatatypesHandler.java
index bc52183e9..c07db0910 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/DatatypesHandler.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/DatatypesHandler.java
@@ -102,7 +102,7 @@ private static IDataTypeAdapter<?> decode(SimpleValue target) {
 
   private static void encode(IDataTypeAdapter<?> datatype, SimpleValue target) {
     if (datatype != null) {
-      target.setStringValue(datatype.getPreferredName());
+      target.setStringValue(datatype.getPreferredName().getLocalPart());
     }
   }
 
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/MetapathExpressionHandler.java b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/MetapathExpressionHandler.java
index b38c6a666..ec0d19f53 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/MetapathExpressionHandler.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/xmlbeans/handler/MetapathExpressionHandler.java
@@ -124,7 +124,7 @@ private static void logContextError(
     builder.append(" is not properly contextualized using '.'. Using '")
         .append(newPath)
         .append("' instead.");
-    LOGGER.atInfo().log(builder.toString());
+    LOGGER.atWarn().log(builder.toString());
   }
 
   /**
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/CollectionUtil.java b/core/src/main/java/gov/nist/secauto/metaschema/core/util/CollectionUtil.java
index 4cf2a30a7..80e5ce5c8 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/CollectionUtil.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/util/CollectionUtil.java
@@ -1,261 +1,404 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
-public final class CollectionUtil {
-
-  private CollectionUtil() {
-    // disable construction
-  }
-
-  /**
-   * Get a {@link Stream} for the provided {@link Iterable}.
-   *
-   * @param <T>
-   *          the type to iterate on
-   * @param iterator
-   *          the iterator
-   * @return the stream
-   */
-  public static <T> Stream<T> toStream(@NonNull Iterator<T> iterator) {
-    Iterable<T> iterable = toIterable(iterator);
-    return StreamSupport.stream(iterable.spliterator(), false);
-  }
-
-  /**
-   * Get an {@link Iterable} for the provided {@link Stream}.
-   *
-   * @param <T>
-   *          the type to iterate on
-   * @param stream
-   *          the stream to iterate over
-   * @return the resulting iterable instance
-   */
-  @NonNull
-  public static <T> Iterable<T> toIterable(@NonNull Stream<T> stream) {
-    return toIterable(ObjectUtils.notNull(stream.iterator()));
-  }
-
-  /**
-   * Get an {@link Iterable} for the provided {@link Iterator}.
-   *
-   * @param <T>
-   *          the type to iterate on
-   * @param iterator
-   *          the iterator
-   * @return the resulting iterable instance
-   */
-  @NonNull
-  public static <T> Iterable<T> toIterable(@NonNull Iterator<T> iterator) {
-    return () -> iterator;
-  }
-
-  /**
-   * Get a reverse {@link Iterable} for the provided {@link List}.
-   *
-   * @param <T>
-   *          the type to iterate on
-   * @param list
-   *          the list of items to iterate over
-   * @return the resulting iterable instance
-   */
-  @NonNull
-  public static <T> Iterable<T> toDescendingIterable(@NonNull List<T> list) {
-    return toIterable(descendingIterator(list));
-  }
-
-  /**
-   * Convert the provided {@link Iterable} to a list of the same generic type.
-   *
-   * @param <T>
-   *          the collection item's generic type
-   * @param iterable
-   *          the Iterable to convert to a list
-   * @return the list
-   */
-  @NonNull
-  public static <T> List<T> toList(Iterable<T> iterable) {
-    return ObjectUtils.notNull(StreamSupport.stream(iterable.spliterator(), false).collect(Collectors.toList()));
-  }
-
-  /**
-   * Convert the provided {@link Iterator} to a list of the same generic type.
-   *
-   * @param <T>
-   *          the collection item's generic type
-   * @param iterator
-   *          the Iterator to convert to a list
-   * @return the list
-   */
-  @NonNull
-  public static <T> List<T> toList(Iterator<T> iterator) {
-    return ObjectUtils.notNull(
-        StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false)
-            .collect(Collectors.toList()));
-  }
-
-  /**
-   * Get a reverse {@link Iterator} for the provided {@link List}.
-   *
-   * @param <T>
-   *          the type to iterate on
-   * @param list
-   *          the list of items to iterate over
-   * @return the resulting Iterator instance
-   */
-  @NonNull
-  public static <T> Iterator<T> descendingIterator(@NonNull List<T> list) {
-    Iterator<T> retval;
-    if (list instanceof LinkedList) {
-      retval = ((LinkedList<T>) list).descendingIterator();
-    } else if (list instanceof ArrayList) {
-      retval = IntStream.range(0, list.size())
-          .map(i -> list.size() - 1 - i)
-          .mapToObj(list::get).iterator();
-    } else {
-      throw new UnsupportedOperationException();
-    }
-    return ObjectUtils.notNull(retval);
-  }
-
-  @NonNull
-  public static <T extends Collection<A>, A> T requireNonEmpty(@NonNull T collection) {
-    if (collection.isEmpty()) {
-      throw new IllegalStateException();
-    }
-    return collection;
-  }
-
-  @NonNull
-  public static <T extends Collection<A>, A> T requireNonEmpty(@NonNull T collection, @NonNull String message) {
-    if (collection.isEmpty()) {
-      throw new IllegalStateException(message);
-    }
-    return collection;
-  }
-
-  /**
-   * A wrapper of the {@link Collections#unmodifiableCollection(Collection)}
-   * method that ensure a {@link NonNull} result is returned.
-   *
-   * @param <T>
-   *          the collection's item type
-   * @param collection
-   *          the collection
-   * @return a non-null unmodifiable instance of the provided collection
-   */
-  @SuppressWarnings("null")
-  @NonNull
-  public static <T> Collection<T> unmodifiableCollection(@NonNull Collection<T> collection) {
-    return Collections.unmodifiableCollection(collection);
-  }
-
-  @SuppressWarnings("null")
-  @NonNull
-  public static <T> Set<T> singleton(@NonNull T value) {
-    return Collections.singleton(value);
-  }
-
-  @SuppressWarnings("null")
-  @NonNull
-  public static <T> Set<T> emptySet() {
-    return Collections.emptySet();
-  }
-
-  @SuppressWarnings("null")
-  @NonNull
-  public static <T> Set<T> unmodifiableSet(@NonNull Set<T> set) {
-    return Collections.unmodifiableSet(set);
-  }
-
-  @NonNull
-  public static <T> List<T> listOrEmpty(@Nullable List<T> list) {
-    return list == null ? emptyList() : list;
-  }
-
-  @SafeVarargs
-  @SuppressWarnings("null")
-  @NonNull
-  public static <T> List<T> listOrEmpty(@Nullable T... array) {
-    return array == null || array.length == 0 ? emptyList() : Arrays.asList(array);
-  }
-
-  @SuppressWarnings("null")
-  @NonNull
-  public static <T> List<T> emptyList() {
-    return Collections.emptyList();
-  }
-
-  @SuppressWarnings("null")
-  @NonNull
-  public static <T> List<T> unmodifiableList(@NonNull List<T> list) {
-    return Collections.unmodifiableList(list);
-  }
-
-  @SuppressWarnings("null")
-  @NonNull
-  public static <T> List<T> singletonList(@NonNull T instance) {
-    return Collections.singletonList(instance);
-  }
-
-  @SuppressWarnings("null")
-  @NonNull
-  public static <K, V> Map<K, V> emptyMap() {
-    return Collections.emptyMap();
-  }
-
-  @SuppressWarnings("null")
-  @NonNull
-  public static <K, V> Map<K, V> singletonMap(@NonNull K key, @NonNull V value) {
-    return Collections.singletonMap(key, value);
-  }
-
-  @SuppressWarnings("null")
-  @NonNull
-  public static <K, V> Map<K, V> unmodifiableMap(@NonNull Map<K, V> map) {
-    return Collections.unmodifiableMap(map);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+@SuppressWarnings("PMD.CouplingBetweenObjects")
+public final class CollectionUtil {
+  /**
+   * Get a {@link Stream} for the provided {@link Iterable}.
+   *
+   * @param <T>
+   *          the type to iterate on
+   * @param iterator
+   *          the iterator
+   * @return the stream
+   */
+  public static <T> Stream<T> toStream(@NonNull Iterator<T> iterator) {
+    Iterable<T> iterable = toIterable(iterator);
+    return StreamSupport.stream(iterable.spliterator(), false);
+  }
+
+  /**
+   * Get an {@link Iterable} for the provided {@link Stream}.
+   *
+   * @param <T>
+   *          the type to iterate on
+   * @param stream
+   *          the stream to iterate over
+   * @return the resulting iterable instance
+   */
+  @NonNull
+  public static <T> Iterable<T> toIterable(@NonNull Stream<T> stream) {
+    return toIterable(ObjectUtils.notNull(stream.iterator()));
+  }
+
+  /**
+   * Get an {@link Iterable} for the provided {@link Iterator}.
+   *
+   * @param <T>
+   *          the type to iterate on
+   * @param iterator
+   *          the iterator
+   * @return the resulting iterable instance
+   */
+  @NonNull
+  public static <T> Iterable<T> toIterable(@NonNull Iterator<T> iterator) {
+    return () -> iterator;
+  }
+
+  /**
+   * Get a reverse {@link Iterable} for the provided {@link List}.
+   *
+   * @param <T>
+   *          the type to iterate on
+   * @param list
+   *          the list of items to iterate over
+   * @return the resulting iterable instance
+   */
+  @NonNull
+  public static <T> Iterable<T> toDescendingIterable(@NonNull List<T> list) {
+    return toIterable(descendingIterator(list));
+  }
+
+  /**
+   * Convert the provided {@link Iterable} to a list of the same generic type.
+   *
+   * @param <T>
+   *          the collection item's generic type
+   * @param iterable
+   *          the Iterable to convert to a list
+   * @return the list
+   */
+  @NonNull
+  public static <T> List<T> toList(Iterable<T> iterable) {
+    return ObjectUtils.notNull(StreamSupport.stream(iterable.spliterator(), false).collect(Collectors.toList()));
+  }
+
+  /**
+   * Convert the provided {@link Iterator} to a list of the same generic type.
+   *
+   * @param <T>
+   *          the collection item's generic type
+   * @param iterator
+   *          the Iterator to convert to a list
+   * @return the list
+   */
+  @NonNull
+  public static <T> List<T> toList(Iterator<T> iterator) {
+    return ObjectUtils.notNull(
+        StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false)
+            .collect(Collectors.toList()));
+  }
+
+  /**
+   * Get a reverse {@link Iterator} for the provided {@link List}.
+   *
+   * @param <T>
+   *          the type to iterate on
+   * @param list
+   *          the list of items to iterate over
+   * @return the resulting Iterator instance
+   */
+  @NonNull
+  public static <T> Iterator<T> descendingIterator(@NonNull List<T> list) {
+    Iterator<T> retval;
+    if (list instanceof LinkedList) {
+      retval = ((LinkedList<T>) list).descendingIterator();
+    } else if (list instanceof ArrayList) {
+      retval = IntStream.range(0, list.size())
+          .map(i -> list.size() - 1 - i)
+          .mapToObj(list::get).iterator();
+    } else {
+      throw new UnsupportedOperationException();
+    }
+    return ObjectUtils.notNull(retval);
+  }
+
+  /**
+   * Require that the provided collection contains at least a single item.
+   *
+   * @param <T>
+   *          the Java type of the collection
+   * @param <U>
+   *          the Java type of the collection's items
+   * @param collection
+   *          the collection to test
+   * @return the provided collection
+   * @throws IllegalStateException
+   *           if the collection is empty
+   */
+  @NonNull
+  public static <T extends Collection<U>, U> T requireNonEmpty(@NonNull T collection) {
+    if (collection.isEmpty()) {
+      throw new IllegalStateException();
+    }
+    return collection;
+  }
+
+  /**
+   * Require that the provided collection contains at least a single item.
+   *
+   * @param <T>
+   *          the Java type of the collection
+   * @param <U>
+   *          the Java type of the collection's items
+   * @param collection
+   *          the collection to test
+   * @param message
+   *          the exception message to use if the collection is empty
+   * @return the provided collection
+   * @throws IllegalStateException
+   *           if the collection is empty
+   */
+  @NonNull
+  public static <T extends Collection<U>, U> T requireNonEmpty(@NonNull T collection, @NonNull String message) {
+    if (collection.isEmpty()) {
+      throw new IllegalStateException(message);
+    }
+    return collection;
+  }
+
+  /**
+   * An implementation of {@link Collections#unmodifiableCollection(Collection)}
+   * that respects non-nullness.
+   *
+   * @param <T>
+   *          the collection's item type
+   * @param collection
+   *          the collection
+   * @return an unmodifiable view of the collection
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static <T> Collection<T> unmodifiableCollection(@NonNull Collection<T> collection) {
+    return Collections.unmodifiableCollection(collection);
+  }
+
+  /**
+   * An implementation of {@link Collections#singleton(Object)} that respects
+   * non-nullness.
+   *
+   * @param <T>
+   *          the Java type of the set items
+   * @param instance
+   *          the singleton item to use
+   * @return an unmodifiable set containing the singleton item
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static <T> Set<T> singleton(@NonNull T instance) {
+    return Collections.singleton(instance);
+  }
+
+  /**
+   * An implementation of {@link Collections#emptySet()} that respects
+   * non-nullness.
+   *
+   * @param <T>
+   *          the Java type of the set items
+   * @return an unmodifiable empty set
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static <T> Set<T> emptySet() {
+    return Collections.emptySet();
+  }
+
+  /**
+   * An implementation of {@link Collections#unmodifiableSet(Set)} that respects
+   * non-nullness.
+   *
+   * @param <T>
+   *          the Java type of the set items
+   * @param set
+   *          the set to prevent modification of
+   * @return an unmodifiable view of the set
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static <T> Set<T> unmodifiableSet(@NonNull Set<T> set) {
+    return Collections.unmodifiableSet(set);
+  }
+
+  /**
+   * Provides an unmodifiable list containing the provided list.
+   * <p>
+   * If the provided list is {@code null}, an empty list will be provided.
+   *
+   * @param <T>
+   *          the Java type of the list items
+   * @param list
+   *          the list, which may be {@code null}
+   * @return an unmodifiable list containing the items
+   */
+  @NonNull
+  public static <T> List<T> listOrEmpty(@Nullable List<T> list) {
+    return list == null ? emptyList() : unmodifiableList(list);
+  }
+
+  /**
+   * Generates a new unmodifiable list containing the provided items.
+   * <p>
+   * If the provided array is {@code null}, an empty list will be provided.
+   *
+   * @param <T>
+   *          the Java type of the list items
+   * @param array
+   *          the array of items to use to populate the list, which may be
+   *          {@code null}
+   * @return an unmodifiable list containing the items
+   */
+  @SafeVarargs
+  @SuppressWarnings("null")
+  @NonNull
+  public static <T> List<T> listOrEmpty(@Nullable T... array) {
+    return array == null || array.length == 0 ? emptyList() : unmodifiableList(Arrays.asList(array));
+  }
+
+  /**
+   * An implementation of {@link Collections#emptyList()} that respects
+   * non-nullness.
+   *
+   * @param <T>
+   *          the Java type of the list items
+   * @return an unmodifiable empty list
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static <T> List<T> emptyList() {
+    return Collections.emptyList();
+  }
+
+  /**
+   * An implementation of {@link Collections#unmodifiableList(List)} that respects
+   * non-nullness.
+   *
+   * @param <T>
+   *          the Java type of the list items
+   * @param list
+   *          the list to prevent modification of
+   * @return an unmodifiable view of the list
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static <T> List<T> unmodifiableList(@NonNull List<T> list) {
+    return Collections.unmodifiableList(list);
+  }
+
+  /**
+   * An implementation of {@link Collections#singletonList(Object)} that respects
+   * non-nullness.
+   *
+   * @param <T>
+   *          the Java type of the list items
+   * @param instance
+   *          the singleton item to use
+   * @return an unmodifiable list containing the singleton item
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static <T> List<T> singletonList(@NonNull T instance) {
+    return Collections.singletonList(instance);
+  }
+
+  /**
+   * An implementation of {@link Collections#emptyMap()} that respects
+   * non-nullness.
+   *
+   * @param <K>
+   *          the Java type of the map's keys
+   * @param <V>
+   *          the Java type of the map's values
+   * @return an unmodifiable empty map
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static <K, V> Map<K, V> emptyMap() {
+    return Collections.emptyMap();
+  }
+
+  /**
+   * An implementation of {@link Collections#singletonMap(Object, Object)} that
+   * respects non-nullness.
+   *
+   * @param <K>
+   *          the Java type of the map's keys
+   * @param <V>
+   *          the Java type of the map's values
+   * @param key
+   *          the singleton key
+   * @param value
+   *          the singleton value
+   * @return an unmodifiable map containing the singleton entry
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static <K, V> Map<K, V> singletonMap(@NonNull K key, @NonNull V value) {
+    return Collections.singletonMap(key, value);
+  }
+
+  /**
+   * An implementation of {@link Collections#unmodifiableMap(Map)} that respects
+   * non-nullness.
+   *
+   * @param map
+   *          the map to prevent modification of
+   * @param <K>
+   *          the Java type of the map's keys
+   * @param <V>
+   *          the Java type of the map's values
+   * @return an unmodifiable view of the map
+   */
+  @SuppressWarnings("null")
+  @NonNull
+  public static <K, V> Map<K, V> unmodifiableMap(@NonNull Map<K, V> map) {
+    return Collections.unmodifiableMap(map);
+  }
+
+  private CollectionUtil() {
+    // disable construction
+  }
+}
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/CustomCollectors.java b/core/src/main/java/gov/nist/secauto/metaschema/core/util/CustomCollectors.java
index 532e8f6b0..4975f1e50 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/CustomCollectors.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/util/CustomCollectors.java
@@ -40,17 +40,28 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+@SuppressWarnings("PMD.CouplingBetweenObjects")
 public final class CustomCollectors {
-  private CustomCollectors() {
-    // disable
-  }
-
+  /**
+   * An implementation of {@link Function#identity()} that respects non-nullness.
+   *
+   * @param <T>
+   *          the Java type of the identity object
+   * @return the identity function
+   */
   @SuppressWarnings("null")
   @NonNull
   public static <T> Function<T, T> identity() {
     return Function.identity();
   }
 
+  /**
+   * Joins a sequence of string values using oxford-style serial commas.
+   *
+   * @param conjunction
+   *          the conjunction to use after the penultimate comma (e.g., and, or)
+   * @return a collector that will perform the joining
+   */
   public static Collector<CharSequence, ?, String> joiningWithOxfordComma(@NonNull String conjunction) {
     return Collectors.collectingAndThen(Collectors.toList(), withOxfordComma(conjunction));
   }
@@ -124,6 +135,26 @@ public static <V, K> Stream<V> distinctByKey(
     return uniqueRoles.values().stream();
   }
 
+  /**
+   * Produces a map collector that uses the provided key and value mappers, and a
+   * duplicate hander to manage duplicate key insertion.
+   *
+   * @param <T>
+   *          the item Java type
+   * @param <K>
+   *          the map key Java type
+   * @param <V>
+   *          the map value Java type
+   * @param keyMapper
+   *          the function used to produce the map's key based on the provided
+   *          item
+   * @param valueMapper
+   *          the function used to produce the map's value based on the provided
+   *          item
+   * @param duplicateHander
+   *          the handler used to manage duplicate key insertion
+   * @return the collector
+   */
   @NonNull
   public static <T, K, V> Collector<T, ?, Map<K, V>> toMap(
       @NonNull Function<? super T, ? extends K> keyMapper,
@@ -132,6 +163,30 @@ public static <V, K> Stream<V> distinctByKey(
     return toMap(keyMapper, valueMapper, duplicateHander, HashMap::new);
   }
 
+  /**
+   * Produces a map collector that uses the provided key and value mappers, and a
+   * duplicate hander to manage duplicate key insertion.
+   *
+   * @param <T>
+   *          the item Java type
+   * @param <K>
+   *          the map key Java type
+   * @param <V>
+   *          the map value Java type
+   * @param <M>
+   *          the Java type of the resulting map
+   * @param keyMapper
+   *          the function used to produce the map's key based on the provided
+   *          item
+   * @param valueMapper
+   *          the function used to produce the map's value based on the provided
+   *          item
+   * @param duplicateHander
+   *          the handler used to manage duplicate key insertion
+   * @param supplier
+   *          the supplier used to create the resulting map
+   * @return the collector
+   */
   @NonNull
   public static <T, K, V, M extends Map<K, V>> Collector<T, ?, M> toMap(
       @NonNull Function<? super T, ? extends K> keyMapper,
@@ -163,19 +218,57 @@ public static <V, K> Stream<V> distinctByKey(
             }));
   }
 
+  /**
+   * A handler that supports resolving duplicate keys while inserting values into
+   * a map.
+   *
+   * @param <K>
+   *          the Java type of the map's keys
+   * @param <V>
+   *          the Java type of the map's values
+   */
   @FunctionalInterface
   public interface DuplicateHandler<K, V> {
+    /**
+     * The handler callback.
+     *
+     * @param key
+     *          the duplicate key
+     * @param value1
+     *          the first value associated with the key
+     * @param value2
+     *          the second value associated with the key
+     * @return the value to insert into the map
+     */
     @NonNull
     V handle(K key, @NonNull V value1, V value2);
   }
 
+  /**
+   * A binary operator that will always use the first of two values.
+   *
+   * @param <T>
+   *          the item type
+   * @return the operator
+   */
   @NonNull
   public static <T> BinaryOperator<T> useFirstMapper() {
     return (value1, value2) -> value1;
   }
 
+  /**
+   * A binary operator that will always use the second of two values.
+   *
+   * @param <T>
+   *          the item type
+   * @return the operator
+   */
   @NonNull
   public static <T> BinaryOperator<T> useLastMapper() {
     return (value1, value2) -> value2;
   }
+
+  private CustomCollectors() {
+    // disable construction
+  }
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/IVersionInfo.java b/core/src/main/java/gov/nist/secauto/metaschema/core/util/IVersionInfo.java
index 73057178a..0f049e490 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/IVersionInfo.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/util/IVersionInfo.java
@@ -28,25 +28,63 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * Provides version information for a runtime dependency or application.
+ */
 public interface IVersionInfo {
+  /**
+   * The subject's name.
+   *
+   * @return the name
+   */
   @NonNull
   String getName();
 
+  /**
+   * The subject's version.
+   *
+   * @return the version
+   */
   @NonNull
   String getVersion();
 
+  /**
+   * The time the subject was last built.
+   *
+   * @return the build time
+   */
   @NonNull
   String getBuildTimestamp();
 
+  /**
+   * The git repository URL used to retrieve the branch.
+   *
+   * @return the git repository URL
+   */
   @NonNull
   String getGitOriginUrl();
 
+  /**
+   * The last git commit hash.
+   *
+   * @return the commit hash
+   */
   @NonNull
   String getGitCommit();
 
+  /**
+   * The current git branch.
+   *
+   * @return the git branch
+   */
   @NonNull
   String getGitBranch();
 
+  /**
+   * The closest tag in the git commit history.
+   *
+   * @return a tag name
+   */
   @NonNull
   String getGitClosestTag();
 }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/ObjectUtils.java b/core/src/main/java/gov/nist/secauto/metaschema/core/util/ObjectUtils.java
index 59681b807..37043a66a 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/ObjectUtils.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/util/ObjectUtils.java
@@ -31,6 +31,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public final class ObjectUtils {
   private ObjectUtils() {
@@ -50,7 +51,7 @@ private ObjectUtils() {
    * @return the object
    */
   @NonNull
-  public static <T> T notNull(T obj) {
+  public static <T> T notNull(@Nullable T obj) {
     assert obj != null;
     return obj;
   }
@@ -67,7 +68,8 @@ public static <T> T notNull(T obj) {
    *           if {@code obj} is {@code null}
    */
   @NonNull
-  public static <T> T requireNonNull(T obj) {
+  @SuppressFBWarnings("NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE")
+  public static <T> T requireNonNull(@Nullable T obj) {
     if (obj == null) {
       throw new NullPointerException(); // NOPMD
     }
@@ -89,7 +91,8 @@ public static <T> T requireNonNull(T obj) {
    *           if {@code obj} is {@code null}
    */
   @NonNull
-  public static <T> T requireNonNull(T obj, String message) {
+  @SuppressFBWarnings("NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE")
+  public static <T> T requireNonNull(@Nullable T obj, @NonNull String message) {
     if (obj == null) {
       throw new NullPointerException(message); // NOPMD
     }
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java b/core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java
index 60a99eb50..35da35e76 100644
--- a/core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java
+++ b/core/src/main/java/gov/nist/secauto/metaschema/core/util/UriUtils.java
@@ -31,10 +31,15 @@
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.regex.Pattern;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public final class UriUtils {
+  private static final Pattern URI_SEPERATOR_PATTERN = Pattern.compile("\\/");
+  private static final String URI_SEPERATOR = "/";
 
   private UriUtils() {
     // disable construction
@@ -71,4 +76,93 @@ public static URI toUri(@NonNull String location, @NonNull URI baseUri) throws U
     }
     return baseUri.resolve(asUri.normalize());
   }
+
+  /**
+   * This function extends the functionality of {@link URI#relativize(URI)} by
+   * supporting relative reference pathing (e.g., ..), when the {@code prepend}
+   * parameter is set to {@code true}.
+   *
+   * @param base
+   *          the URI to relativize against
+   * @param other
+   *          the URI to make relative
+   * @param prepend
+   *          if {@code true}, then prepend relative pathing
+   * @return a new relative URI
+   * @throws URISyntaxException
+   *           if any of the URIs are malformed
+   */
+  public static URI relativize(URI base, URI other, boolean prepend) throws URISyntaxException {
+    URI normBase = Objects.requireNonNull(base).normalize();
+    URI normOther = Objects.requireNonNull(other).normalize();
+    URI retval = normBase.relativize(normOther);
+
+    if (prepend && !normBase.isOpaque() && !retval.isOpaque() && hasSameSchemeAndAuthority(normBase, retval)) {
+      // the URIs are not opaque and they share the same scheme and authority
+      String basePath = normBase.getPath();
+      String targetPath = normOther.getPath();
+      String newPath = prependRelativePath(basePath, targetPath);
+
+      retval = new URI(null, null, newPath, normOther.getQuery(), normOther.getFragment());
+    }
+
+    return retval;
+  }
+
+  private static boolean hasSameSchemeAndAuthority(URI base, URI other) {
+    String baseScheme = base.getScheme();
+    boolean retval = (baseScheme == null && other.getScheme() == null)
+        || (baseScheme != null && baseScheme.equals(other.getScheme()));
+    String baseAuthority = base.getAuthority();
+    retval = retval && ((baseAuthority == null && other.getAuthority() == null)
+        || (baseAuthority != null && baseAuthority.equals(other.getAuthority())));
+    return retval;
+  }
+
+  /**
+   * Based on code from
+   * http://stackoverflow.com/questions/10801283/get-relative-path-of-two-uris-in-java
+   *
+   * @param base
+   *          the base path to resolve against
+   * @param target
+   *          the URI to relativize against the base
+   * @return the relativized URI
+   */
+  @SuppressWarnings("PMD.CyclomaticComplexity")
+  public static String prependRelativePath(String base, String target) {
+
+    // Split paths into segments
+    String[] baseSegments = URI_SEPERATOR_PATTERN.split(base);
+    String[] targetSegments = URI_SEPERATOR_PATTERN.split(target, -1);
+
+    // Discard trailing segment of base path, since this resource doesn't matter
+    if (baseSegments.length > 0 && !base.endsWith(URI_SEPERATOR)) {
+      baseSegments = Arrays.copyOf(baseSegments, baseSegments.length - 1);
+    }
+
+    // Remove common prefix segments
+    int segmentIndex = 0;
+    while (segmentIndex < baseSegments.length && segmentIndex < targetSegments.length
+        && baseSegments[segmentIndex].equals(targetSegments[segmentIndex])) {
+      segmentIndex++;
+    }
+
+    // Construct the relative path
+    StringBuilder retval = new StringBuilder();
+    for (int j = 0; j < (baseSegments.length - segmentIndex); j++) {
+      retval.append("..");
+      if (retval.length() != 0) {
+        retval.append(URI_SEPERATOR);
+      }
+    }
+
+    for (int j = segmentIndex; j < targetSegments.length; j++) {
+      retval.append(targetSegments[j]);
+      if (retval.length() != 0 && j < targetSegments.length - 1) {
+        retval.append(URI_SEPERATOR);
+      }
+    }
+    return retval.toString();
+  }
 }
diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java
index 69c153471..64f244464 100644
--- a/core/src/main/java/module-info.java
+++ b/core/src/main/java/module-info.java
@@ -1,4 +1,3 @@
-
 /*
  * Portions of this software was developed by employees of the National Institute
  * of Standards and Technology (NIST), an agency of the Federal Government and is
@@ -25,6 +24,33 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
+/*
+ * Portions of this software was developed by employees of the National
+ * Institute of Standards and Technology (NIST), an agency of the Federal
+ * Government and is being made available as a public service. Pursuant to title
+ * 17 United States Code Section 105, works of NIST employees are not subject to
+ * copyright protection in the United States. This software may be subject to
+ * foreign copyright. Permission in the United States and in foreign countries,
+ * to the extent that NIST may hold copyright, to use, copy, modify, create
+ * derivative works, and distribute this software and its documentation without
+ * fee is hereby granted on a non-exclusive basis, provided that this notice and
+ * disclaimer of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE. IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON
+ * WARRANTY, CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED
+ * BY PERSONS OR PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED
+ * FROM, OR AROSE OUT OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES
+ * PROVIDED HEREUNDER.
+ */
+
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeProvider;
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupDataTypeProvider;
@@ -62,7 +88,7 @@
   requires flexmark.ext.escaped.character;
   requires flexmark.ext.gfm.strikethrough;
   requires flexmark.ext.superscript;
-  requires flexmark.ext.tables;
+  requires transitive flexmark.ext.tables;
   requires transitive flexmark.ext.typographic;
   requires transitive flexmark.html2md.converter;
   requires transitive flexmark.util.ast;
@@ -73,7 +99,7 @@
   requires flexmark.util.format;
   requires flexmark.util.html;
   requires flexmark.util.misc;
-  requires flexmark.util.sequence;
+  requires transitive flexmark.util.sequence;
   requires flexmark.util.visitor;
 
   exports gov.nist.secauto.metaschema.core.configuration;
@@ -87,6 +113,7 @@
   exports gov.nist.secauto.metaschema.core.metapath.function.library;
   exports gov.nist.secauto.metaschema.core.metapath.item;
   exports gov.nist.secauto.metaschema.core.metapath.item.atomic;
+  exports gov.nist.secauto.metaschema.core.metapath.item.function;
   exports gov.nist.secauto.metaschema.core.metapath.item.node;
   exports gov.nist.secauto.metaschema.core.model;
   exports gov.nist.secauto.metaschema.core.model.constraint;
diff --git a/core/src/schema/xmlconfig.xml b/core/src/schema/xmlconfig.xml
index 554903bfa..73d4d6534 100644
--- a/core/src/schema/xmlconfig.xml
+++ b/core/src/schema/xmlconfig.xml
@@ -42,10 +42,12 @@
 		javaname="gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter">
 		<xb:staticHandler>gov.nist.secauto.metaschema.core.model.xml.xmlbeans.handler.DatatypesHandler</xb:staticHandler>
 	</xb:usertype>
+<!-- 
 	<xb:usertype name="meta:MetaschemaPathType"
 		javaname="gov.nist.secauto.metaschema.core.metapath.MetapathExpression">
 		<xb:staticHandler>gov.nist.secauto.metaschema.core.model.xml.xmlbeans.handler.MetapathExpressionHandler</xb:staticHandler>
 	</xb:usertype>
+-->
 	<xb:usertype name="meta:RegexType"
 		javaname="java.util.regex.Pattern">
 		<xb:staticHandler>gov.nist.secauto.metaschema.core.model.xml.xmlbeans.handler.RegexTypeHandler</xb:staticHandler>
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupStringTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupStringTest.java
index 36680e7c8..540c69b31 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupStringTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupStringTest.java
@@ -1,394 +1,394 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.markup;
-
-import com.ctc.wstx.api.WstxOutputProperties;
-import com.ctc.wstx.stax.WstxOutputFactory;
-import com.vladsch.flexmark.ast.Emphasis;
-import com.vladsch.flexmark.ast.Heading;
-import com.vladsch.flexmark.ast.Paragraph;
-import com.vladsch.flexmark.ast.StrongEmphasis;
-import com.vladsch.flexmark.ast.Text;
-import com.vladsch.flexmark.ast.TextBase;
-import com.vladsch.flexmark.ext.escaped.character.EscapedCharacter;
-import com.vladsch.flexmark.util.ast.Document;
-import com.vladsch.flexmark.util.ast.Node;
-
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.AstCollectingVisitor;
-import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode;
-import gov.nist.secauto.metaschema.core.util.CollectionUtil;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.codehaus.stax2.XMLOutputFactory2;
-import org.codehaus.stax2.XMLStreamWriter2;
-import org.codehaus.stax2.ri.evt.MergedNsContext;
-import org.codehaus.stax2.ri.evt.NamespaceEventImpl;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.List;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-class MarkupStringTest {
-  private static final Logger LOGGER = LogManager.getLogger(MarkupStringTest.class);
-  private static final String MARKUP_HTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
-  private static final String MARKUP_HTML_PREFIX = "";
-
-  @NonNull
-  XMLStreamWriter2 newXmlStreamWriter(@NonNull StringWriter stringWriter) throws XMLStreamException {
-    XMLOutputFactory2 factory = (XMLOutputFactory2) XMLOutputFactory.newInstance();
-    assert factory instanceof WstxOutputFactory;
-    factory.setProperty(WstxOutputProperties.P_OUTPUT_VALIDATE_STRUCTURE, false);
-    XMLStreamWriter2 xmlStreamWriter = (XMLStreamWriter2) factory.createXMLStreamWriter(stringWriter);
-    NamespaceContext nsContext = MergedNsContext.construct(xmlStreamWriter.getNamespaceContext(),
-        List.of(NamespaceEventImpl.constructNamespace(null, MARKUP_HTML_PREFIX, MARKUP_HTML_NAMESPACE)));
-    xmlStreamWriter.setNamespaceContext(nsContext);
-    return xmlStreamWriter;
-  }
-
-  @Test
-  void markupLineFromMarkdownTest() {
-    String markdown = "Some \\**more* **text** and a param: {{ insert: param, insert }}.";
-
-    MarkupLine ms = MarkupLine.fromMarkdown(markdown);
-    Document document = ms.getDocument();
-
-    Assertions.assertNotNull(document);
-
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(document));
-    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-
-    // Document[0, 49]
-    List<Node> documentChildren = CollectionUtil.toList(document.getChildren());
-    {
-      // Paragraph[0, 49]
-      // ensure there is a single paragraph
-      Assertions.assertEquals(1, documentChildren.size());
-      Node paragraph = documentChildren.get(0);
-      Assertions.assertTrue(paragraph instanceof Paragraph);
-
-      List<Node> paragraphChildren = CollectionUtil.toList(paragraph.getChildren());
-      // TextBase[0, 7] chars:[0, 7, "Some \*"]
-      {
-        TextBase textBase = (TextBase) paragraphChildren.get(0);
-        List<Node> textBaseChildren = CollectionUtil.toList(textBase.getChildren());
-        // Text[0, 5] chars:[0, 5, "Some "]
-        {
-          Text text = (Text) textBaseChildren.get(0);
-          Assertions.assertEquals("Some ", text.getChars().toString());
-        }
-        // EscapedCharacter[5, 7] textOpen:[5, 6, "\"] text:[6, 7, "*"]
-        {
-          EscapedCharacter text = (EscapedCharacter) textBaseChildren.get(1);
-          Assertions.assertEquals("*", text.getText().toString());
-        }
-      }
-      // Emphasis[7, 13] textOpen:[7, 8, "*"] text:[8, 12, "more"] textClose:[12, 13,
-      // "*"]
-      {
-        Emphasis emphasis = (Emphasis) paragraphChildren.get(1);
-        List<Node> emphasisChildren = CollectionUtil.toList(emphasis.getChildren());
-        // Text[8, 12] chars:[8, 12, "more"]
-        {
-          Text text = (Text) emphasisChildren.get(0);
-          Assertions.assertEquals("more", text.getChars().toString());
-        }
-      }
-      // Text[13, 14] chars:[13, 14, " "]
-      {
-        Text text = (Text) paragraphChildren.get(2);
-        Assertions.assertEquals(" ", text.getChars().toString());
-      }
-      // StrongEmphasis[14, 22] textOpen:[14, 16, "**"] text:[16, 20, "text"]
-      // textClose:[20, 22, "**"]
-      {
-        StrongEmphasis strongEmphasis = (StrongEmphasis) paragraphChildren.get(3);
-        List<Node> strongEmphasisChildren = CollectionUtil.toList(strongEmphasis.getChildren());
-        // Text[16, 20] chars:[16, 20, "text"]
-        {
-          Text text = (Text) strongEmphasisChildren.get(0);
-          Assertions.assertEquals("text", text.getChars().toString());
-        }
-
-      }
-      // Text[22, 36] chars:[22, 36, " and … ram: "]
-      {
-        Text text = (Text) paragraphChildren.get(4);
-        Assertions.assertEquals(" and a param: ", text.getChars().toString());
-      }
-      // InsertAnchorNode[0, 0] name:[39, 45, "insert"]
-      {
-        @SuppressWarnings("unused") InsertAnchorNode insert = (InsertAnchorNode) paragraphChildren.get(5);
-      }
-      // Text[48, 49] chars:[48, 49, "."]
-      {
-        Text text = (Text) paragraphChildren.get(6);
-        Assertions.assertEquals(".", text.getChars().toString());
-      }
-    }
-
-    Assertions.assertEquals(markdown, ms.toMarkdown());
-
-    String html
-        = "Some *<em>more</em> <strong>text</strong> and a param: <insert type=\"param\" id-ref=\"insert\" />.";
-
-    Assertions.assertEquals(html, ms.toHtml());
-  }
-
-  @Test
-  void markupMultilineFromMarkdownTest() throws XMLStreamException, IOException {
-    final String markdown = "# Example\n\nSome \"\\**more*\" **text**\n\nA param: {{ insert: param, insert }}.";
-    final String html = "<h1>Example</h1>\n"
-        + "<p>Some <q>*<em>more</em></q> <strong>text</strong></p>\n"
-        + "<p>A param: <insert type=\"param\" id-ref=\"insert\"/>.</p>";
-
-    MarkupMultiline ms = MarkupMultiline.fromMarkdown(markdown);
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
-    LOGGER.atDebug().log("HTML: {}", ms.toXHtml(""));
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-
-    Assertions.assertEquals(markdown, ms.toMarkdown());
-    Assertions.assertEquals(html, ms.toXHtml(""));
-  }
-
-  @Test
-  void markupMultilineFromHtmlTest() throws XMLStreamException, IOException {
-    final String html = "<h1>Example</h1>\n"
-        + "<p><a href=\"link\">text</a><q>quote1</q></p>\n"
-        + "<table>\n"
-        + "<thead>\n"
-        + "<tr><th>Heading 1</th></tr>\n"
-        + "</thead>\n"
-        + "<tbody>\n"
-        + "<tr><td><q>data1</q> <insert type=\"param\" id-ref=\"insert\"/></td></tr>\n"
-        + "<tr><td><q>data2</q> <insert type=\"param\" id-ref=\"insert\"/></td></tr>\n"
-        + "</tbody>\n"
-        + "</table>\n"
-        + "<p>Some <q><em>more</em></q> <strong>text</strong> <img src=\"src\" alt=\"alt\"/></p>";
-    final String markdown = "# Example\n"
-        + "\n"
-        + "[text](link)\"quote1\"\n"
-        + "\n"
-        + "|              Heading 1              |\n"
-        + "|-------------------------------------|\n"
-        + "| \"data1\" {{ insert: param, insert }} |\n"
-        + "| \"data2\" {{ insert: param, insert }} |\n"
-        + "\n"
-        + "Some \"*more*\" **text** ![alt](src)";
-    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
-    LOGGER.atDebug().log("HTML Source: {}", html);
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
-    LOGGER.atDebug().log("HTML: {}", ms.toXHtml(""));
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-    Assertions.assertEquals(markdown, ms.toMarkdown());
-    Assertions.assertEquals(html, ms.toXHtml(""));
-  }
-
-  /*
-   * {@link HtmlConverterCoreNodeRenderer} has a bug on line 629 in the call to "wrapTextNodes", which
-   * can add spaces to the HTML string. This relates to <a
-   * href="https://github.com/vsch/flexmark-java/issues/422">an existing issue</a>.
-   */
-  @Test
-  void markupSpaceHandlingTest() throws XMLStreamException, IOException {
-    final String html = "<p>a <q><em>b</em></q> <strong>c</strong></p>";
-    final String markdown = "a <q>*b*</q> **c**";
-    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
-    LOGGER.atDebug().log("HTML Source: {}", html);
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
-    LOGGER.atDebug().log("HTML: {}", ms.toXHtml(""));
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-    Assertions.assertNotEquals(markdown, ms.toMarkdown());
-    Assertions.assertEquals(html, ms.toXHtml(""));
-  }
-
-  @Test
-  void preMarkdown() {
-    String htmlPreOnly = "<pre>Example **some** *code*</pre>";
-    final String html = "<pre><code>Example **some** *code*\n"
-        + "</code></pre>";
-    final String markdown = "```\n"
-        + "Example **some** *code*\n"
-        + "```";
-
-    MarkupMultiline ms = MarkupMultiline.fromHtml(htmlPreOnly);
-
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
-    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-
-    Assertions.assertEquals(markdown, ms.toMarkdown());
-    Assertions.assertEquals(html, ms.toHtml());
-  }
-
-  @Test
-  void preCodeMarkdown() {
-    final String html = "<pre><code>Example **some** *code*\n"
-        + "nextline\n"
-        + "</code></pre>";
-    final String markdown = "    Example **some** *code*\n"
-        + "    nextline\n";
-
-    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
-
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
-    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-
-    Assertions.assertEquals(markdown, ms.toMarkdown());
-    Assertions.assertEquals(html, ms.toHtml());
-  }
-
-  @Test
-  void paragraphCodeMarkdown() {
-    final String html = "<p>Example<code>**some** *code*</code></p>";
-    final String markdown = "Example`**some** *code*`";
-    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
-
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
-    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-
-    Assertions.assertEquals(markdown, ms.toMarkdown());
-    Assertions.assertEquals(html, ms.toHtml());
-  }
-
-  @Test
-  void testEntityRoundTrip() throws XMLStreamException {
-    final String markdown = "hijacked was used (e.g., the &lt;CTRL&gt; + &lt;ALT&gt; + &lt;DEL&gt; keys).";
-    final String html = "hijacked was used (e.g., the &lt;CTRL&gt; + &lt;ALT&gt; + &lt;DEL&gt; keys).";
-    final String xhtml = "<p>hijacked was used (e.g., the &lt;CTRL&gt; + &lt;ALT&gt; + &lt;DEL&gt; keys).</p>";
-
-    MarkupLine ms = MarkupLine.fromMarkdown(markdown);
-    Document document = ms.getDocument();
-
-    Assertions.assertNotNull(document);
-
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
-    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-
-    Assertions.assertEquals(markdown, ms.toMarkdown());
-    Assertions.assertEquals(html, ms.toHtml().trim());
-
-    StringWriter stringWriter = new StringWriter();
-    XMLStreamWriter2 xmlStreamWriter = newXmlStreamWriter(stringWriter);
-
-    xmlStreamWriter.writeStartElement(MARKUP_HTML_NAMESPACE, "p");
-
-    ms.writeXHtml(MARKUP_HTML_NAMESPACE, xmlStreamWriter);
-
-    xmlStreamWriter.writeEndElement();
-
-    xmlStreamWriter.close();
-
-    Assertions.assertEquals(xhtml, stringWriter.toString());
-  }
-
-  @Test
-  void testAposRoundTrip() throws XMLStreamException {
-    String markdown = "a user’s identity";
-
-    // test from Markdown source
-    MarkupLine ms = MarkupLine.fromMarkdown(markdown);
-    Document document = ms.getDocument();
-
-    Assertions.assertNotNull(document);
-
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
-    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-
-    Assertions.assertEquals(markdown, ms.toMarkdown());
-
-    String html = "a user’s identity";
-    Assertions.assertEquals(html, ms.toHtml().trim());
-
-    StringWriter stringWriter = new StringWriter();
-    XMLStreamWriter2 xmlStreamWriter = newXmlStreamWriter(stringWriter);
-
-    xmlStreamWriter.writeStartElement(MARKUP_HTML_NAMESPACE, "p");
-
-    ms.writeXHtml(MARKUP_HTML_NAMESPACE, xmlStreamWriter);
-
-    xmlStreamWriter.writeEndElement();
-
-    xmlStreamWriter.close();
-
-    Assertions.assertEquals("<p>" + html + "</p>", stringWriter.toString());
-
-    // test from HTML source
-    ms = MarkupLine.fromHtml(html);
-    document = ms.getDocument();
-
-    Assertions.assertNotNull(document);
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
-    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-    Assertions.assertEquals(markdown, ms.toMarkdown());
-    Assertions.assertEquals(html, ms.toHtml().trim());
-  }
-
-  @Test
-  void testHtml() {
-    String html = "<p>before &lt;thing[02] text&gt; after</p>";
-    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
-
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
-    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-  }
-
-  @Test
-  void testIntraTagNewline() {
-    // addresses usnistgov/liboscal-java#5
-    String html = "<h1>A custom title\n" +
-        "  <em>with italic</em>\n" +
-        "</h1>";
-    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
-
-    Document doc = ms.getDocument();
-    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(doc));
-    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
-    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-
-    List<Node> children = CollectionUtil.toList(doc.getChildren());
-    // ensure there is only 1 child and that it is a heading
-    Assertions.assertAll(
-        () -> Assertions.assertEquals(1, children.size()),
-        () -> Assertions.assertEquals(Heading.class, children.get(0).getClass()));
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.markup;
+
+import com.ctc.wstx.api.WstxOutputProperties;
+import com.ctc.wstx.stax.WstxOutputFactory;
+import com.vladsch.flexmark.ast.Emphasis;
+import com.vladsch.flexmark.ast.Heading;
+import com.vladsch.flexmark.ast.Paragraph;
+import com.vladsch.flexmark.ast.StrongEmphasis;
+import com.vladsch.flexmark.ast.Text;
+import com.vladsch.flexmark.ast.TextBase;
+import com.vladsch.flexmark.ext.escaped.character.EscapedCharacter;
+import com.vladsch.flexmark.util.ast.Document;
+import com.vladsch.flexmark.util.ast.Node;
+
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.AstCollectingVisitor;
+import gov.nist.secauto.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.codehaus.stax2.XMLOutputFactory2;
+import org.codehaus.stax2.XMLStreamWriter2;
+import org.codehaus.stax2.ri.evt.MergedNsContext;
+import org.codehaus.stax2.ri.evt.NamespaceEventImpl;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.List;
+
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class MarkupStringTest {
+  private static final Logger LOGGER = LogManager.getLogger(MarkupStringTest.class);
+  private static final String MARKUP_HTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
+  private static final String MARKUP_HTML_PREFIX = "";
+
+  @NonNull
+  XMLStreamWriter2 newXmlStreamWriter(@NonNull StringWriter stringWriter) throws XMLStreamException {
+    XMLOutputFactory2 factory = (XMLOutputFactory2) XMLOutputFactory.newInstance();
+    assert factory instanceof WstxOutputFactory;
+    factory.setProperty(WstxOutputProperties.P_OUTPUT_VALIDATE_STRUCTURE, false);
+    XMLStreamWriter2 xmlStreamWriter = (XMLStreamWriter2) factory.createXMLStreamWriter(stringWriter);
+    NamespaceContext nsContext = MergedNsContext.construct(xmlStreamWriter.getNamespaceContext(),
+        List.of(NamespaceEventImpl.constructNamespace(null, MARKUP_HTML_PREFIX, MARKUP_HTML_NAMESPACE)));
+    xmlStreamWriter.setNamespaceContext(nsContext);
+    return xmlStreamWriter;
+  }
+
+  @Test
+  void markupLineFromMarkdownTest() {
+    String markdown = "Some \\**more* **text** and a param: {{ insert: param, insert }}.";
+
+    MarkupLine ms = MarkupLine.fromMarkdown(markdown);
+    Document document = ms.getDocument();
+
+    Assertions.assertNotNull(document);
+
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(document));
+    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+
+    // Document[0, 49]
+    List<Node> documentChildren = CollectionUtil.toList(document.getChildren());
+    {
+      // Paragraph[0, 49]
+      // ensure there is a single paragraph
+      Assertions.assertEquals(1, documentChildren.size());
+      Node paragraph = documentChildren.get(0);
+      Assertions.assertTrue(paragraph instanceof Paragraph);
+
+      List<Node> paragraphChildren = CollectionUtil.toList(paragraph.getChildren());
+      // TextBase[0, 7] chars:[0, 7, "Some \*"]
+      {
+        TextBase textBase = (TextBase) paragraphChildren.get(0);
+        List<Node> textBaseChildren = CollectionUtil.toList(textBase.getChildren());
+        // Text[0, 5] chars:[0, 5, "Some "]
+        {
+          Text text = (Text) textBaseChildren.get(0);
+          Assertions.assertEquals("Some ", text.getChars().toString());
+        }
+        // EscapedCharacter[5, 7] textOpen:[5, 6, "\"] text:[6, 7, "*"]
+        {
+          EscapedCharacter text = (EscapedCharacter) textBaseChildren.get(1);
+          Assertions.assertEquals("*", text.getText().toString());
+        }
+      }
+      // Emphasis[7, 13] textOpen:[7, 8, "*"] text:[8, 12, "more"] textClose:[12, 13,
+      // "*"]
+      {
+        Emphasis emphasis = (Emphasis) paragraphChildren.get(1);
+        List<Node> emphasisChildren = CollectionUtil.toList(emphasis.getChildren());
+        // Text[8, 12] chars:[8, 12, "more"]
+        {
+          Text text = (Text) emphasisChildren.get(0);
+          Assertions.assertEquals("more", text.getChars().toString());
+        }
+      }
+      // Text[13, 14] chars:[13, 14, " "]
+      {
+        Text text = (Text) paragraphChildren.get(2);
+        Assertions.assertEquals(" ", text.getChars().toString());
+      }
+      // StrongEmphasis[14, 22] textOpen:[14, 16, "**"] text:[16, 20, "text"]
+      // textClose:[20, 22, "**"]
+      {
+        StrongEmphasis strongEmphasis = (StrongEmphasis) paragraphChildren.get(3);
+        List<Node> strongEmphasisChildren = CollectionUtil.toList(strongEmphasis.getChildren());
+        // Text[16, 20] chars:[16, 20, "text"]
+        {
+          Text text = (Text) strongEmphasisChildren.get(0);
+          Assertions.assertEquals("text", text.getChars().toString());
+        }
+
+      }
+      // Text[22, 36] chars:[22, 36, " and … ram: "]
+      {
+        Text text = (Text) paragraphChildren.get(4);
+        Assertions.assertEquals(" and a param: ", text.getChars().toString());
+      }
+      // InsertAnchorNode[0, 0] name:[39, 45, "insert"]
+      {
+        @SuppressWarnings("unused") InsertAnchorNode insert = (InsertAnchorNode) paragraphChildren.get(5);
+      }
+      // Text[48, 49] chars:[48, 49, "."]
+      {
+        Text text = (Text) paragraphChildren.get(6);
+        Assertions.assertEquals(".", text.getChars().toString());
+      }
+    }
+
+    Assertions.assertEquals(markdown, ms.toMarkdown());
+
+    String html
+        = "Some *<em>more</em> <strong>text</strong> and a param: <insert type=\"param\" id-ref=\"insert\" />.";
+
+    Assertions.assertEquals(html, ms.toHtml());
+  }
+
+  @Test
+  void markupMultilineFromMarkdownTest() throws XMLStreamException, IOException {
+    final String markdown = "# Example\n\nSome \"\\**more*\" **text**\n\nA param: {{ insert: param, insert }}.";
+    final String html = "<h1>Example</h1>\n"
+        + "<p>Some <q>*<em>more</em></q> <strong>text</strong></p>\n"
+        + "<p>A param: <insert type=\"param\" id-ref=\"insert\"/>.</p>";
+
+    MarkupMultiline ms = MarkupMultiline.fromMarkdown(markdown);
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
+    LOGGER.atDebug().log("HTML: {}", ms.toXHtml(""));
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+
+    Assertions.assertEquals(markdown, ms.toMarkdown());
+    Assertions.assertEquals(html, ms.toXHtml(""));
+  }
+
+  @Test
+  void markupMultilineFromHtmlTest() throws XMLStreamException, IOException {
+    final String html = "<h1>Example</h1>\n"
+        + "<p><a href=\"link\">text</a><q>quote1</q></p>\n"
+        + "<table>\n"
+        + "<thead>\n"
+        + "<tr><th>Heading 1</th></tr>\n"
+        + "</thead>\n"
+        + "<tbody>\n"
+        + "<tr><td><q>data1</q> <insert type=\"param\" id-ref=\"insert\"/></td></tr>\n"
+        + "<tr><td><q>data2</q> <insert type=\"param\" id-ref=\"insert\"/></td></tr>\n"
+        + "</tbody>\n"
+        + "</table>\n"
+        + "<p>Some <q><em>more</em></q> <strong>text</strong> <img src=\"src\" alt=\"alt\"/></p>";
+    final String markdown = "# Example\n"
+        + "\n"
+        + "[text](link)\"quote1\"\n"
+        + "\n"
+        + "|              Heading 1              |\n"
+        + "|-------------------------------------|\n"
+        + "| \"data1\" {{ insert: param, insert }} |\n"
+        + "| \"data2\" {{ insert: param, insert }} |\n"
+        + "\n"
+        + "Some \"*more*\" **text** ![alt](src)";
+    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
+    LOGGER.atDebug().log("HTML Source: {}", html);
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
+    LOGGER.atDebug().log("HTML: {}", ms.toXHtml(""));
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+    Assertions.assertEquals(markdown, ms.toMarkdown());
+    Assertions.assertEquals(html, ms.toXHtml(""));
+  }
+
+  /*
+   * {@link HtmlConverterCoreNodeRenderer} has a bug on line 629 in the call to "wrapTextNodes", which
+   * can add spaces to the HTML string. This relates to <a
+   * href="https://github.com/vsch/flexmark-java/issues/422">an existing issue</a>.
+   */
+  @Test
+  void markupSpaceHandlingTest() throws XMLStreamException, IOException {
+    final String html = "<p>a <q><em>b</em></q> <strong>c</strong></p>";
+    final String markdown = "a <q>*b*</q> **c**";
+    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
+    LOGGER.atDebug().log("HTML Source: {}", html);
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
+    LOGGER.atDebug().log("HTML: {}", ms.toXHtml(""));
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+    Assertions.assertNotEquals(markdown, ms.toMarkdown());
+    Assertions.assertEquals(html, ms.toXHtml(""));
+  }
+
+  @Test
+  void preMarkdown() {
+    String htmlPreOnly = "<pre>Example **some** *code*</pre>";
+    final String html = "<pre><code>Example **some** *code*\n"
+        + "</code></pre>";
+    final String markdown = "```\n"
+        + "Example **some** *code*\n"
+        + "```";
+
+    MarkupMultiline ms = MarkupMultiline.fromHtml(htmlPreOnly);
+
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
+    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+
+    Assertions.assertEquals(markdown, ms.toMarkdown());
+    Assertions.assertEquals(html, ms.toHtml());
+  }
+
+  @Test
+  void preCodeMarkdown() {
+    final String html = "<pre><code>Example **some** *code*\n"
+        + "nextline\n"
+        + "</code></pre>";
+    final String markdown = "    Example **some** *code*\n"
+        + "    nextline\n";
+
+    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
+
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
+    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+
+    Assertions.assertEquals(markdown, ms.toMarkdown());
+    Assertions.assertEquals(html, ms.toHtml());
+  }
+
+  @Test
+  void paragraphCodeMarkdown() {
+    final String html = "<p>Example<code>**some** *code*</code></p>";
+    final String markdown = "Example`**some** *code*`";
+    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
+
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
+    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+
+    Assertions.assertEquals(markdown, ms.toMarkdown());
+    Assertions.assertEquals(html, ms.toHtml());
+  }
+
+  @Test
+  void testEntityRoundTrip() throws XMLStreamException {
+    final String markdown = "hijacked was used (e.g., the &lt;CTRL&gt; + &lt;ALT&gt; + &lt;DEL&gt; keys).";
+    final String html = "hijacked was used (e.g., the &lt;CTRL&gt; + &lt;ALT&gt; + &lt;DEL&gt; keys).";
+    final String xhtml = "<p>hijacked was used (e.g., the &lt;CTRL&gt; + &lt;ALT&gt; + &lt;DEL&gt; keys).</p>";
+
+    MarkupLine ms = MarkupLine.fromMarkdown(markdown);
+    Document document = ms.getDocument();
+
+    Assertions.assertNotNull(document);
+
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
+    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+
+    Assertions.assertEquals(markdown, ms.toMarkdown());
+    Assertions.assertEquals(html, ms.toHtml().trim());
+
+    StringWriter stringWriter = new StringWriter();
+    XMLStreamWriter2 xmlStreamWriter = newXmlStreamWriter(stringWriter);
+
+    xmlStreamWriter.writeStartElement(MARKUP_HTML_NAMESPACE, "p");
+
+    ms.writeXHtml(MARKUP_HTML_NAMESPACE, xmlStreamWriter);
+
+    xmlStreamWriter.writeEndElement();
+
+    xmlStreamWriter.close();
+
+    Assertions.assertEquals(xhtml, stringWriter.toString());
+  }
+
+  @Test
+  void testAposRoundTrip() throws XMLStreamException {
+    String markdown = "a user’s identity";
+
+    // test from Markdown source
+    MarkupLine ms = MarkupLine.fromMarkdown(markdown);
+    Document document = ms.getDocument();
+
+    Assertions.assertNotNull(document);
+
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
+    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+
+    Assertions.assertEquals(markdown, ms.toMarkdown());
+
+    String html = "a user’s identity";
+    Assertions.assertEquals(html, ms.toHtml().trim());
+
+    StringWriter stringWriter = new StringWriter();
+    XMLStreamWriter2 xmlStreamWriter = newXmlStreamWriter(stringWriter);
+
+    xmlStreamWriter.writeStartElement(MARKUP_HTML_NAMESPACE, "p");
+
+    ms.writeXHtml(MARKUP_HTML_NAMESPACE, xmlStreamWriter);
+
+    xmlStreamWriter.writeEndElement();
+
+    xmlStreamWriter.close();
+
+    Assertions.assertEquals("<p>" + html + "</p>", stringWriter.toString());
+
+    // test from HTML source
+    ms = MarkupLine.fromHtml(html);
+    document = ms.getDocument();
+
+    Assertions.assertNotNull(document);
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
+    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+    Assertions.assertEquals(markdown, ms.toMarkdown());
+    Assertions.assertEquals(html, ms.toHtml().trim());
+  }
+
+  @Test
+  void testHtml() {
+    String html = "<p>before &lt;thing[02] text&gt; after</p>";
+    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
+
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
+    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+  }
+
+  @Test
+  void testIntraTagNewline() {
+    // addresses usnistgov/liboscal-java#5
+    String html = "<h1>A custom title\n" +
+        "  <em>with italic</em>\n" +
+        "</h1>";
+    MarkupMultiline ms = MarkupMultiline.fromHtml(html);
+
+    Document doc = ms.getDocument();
+    LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(doc));
+    LOGGER.atDebug().log("HTML: {}", ms.toHtml());
+    LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+
+    List<Node> children = CollectionUtil.toList(doc.getChildren());
+    // ensure there is only 1 child and that it is a heading
+    Assertions.assertAll(
+        () -> Assertions.assertEquals(1, children.size()),
+        () -> Assertions.assertEquals(Heading.class, children.get(0).getClass()));
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java
index f9cd70861..b37e4dc1c 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java
@@ -1,121 +1,121 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.core.datatype.markup.flexmark;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-
-import com.ctc.wstx.stax.WstxInputFactory;
-
-import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.codehaus.stax2.XMLEventReader2;
-import org.codehaus.stax2.XMLInputFactory2;
-import org.junit.jupiter.api.Test;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-
-class MarkupParserTest {
-  private static final Logger LOGGER = LogManager.getLogger(MarkupParserTest.class);
-
-  @Test
-  void test() throws XMLStreamException {
-    XMLInputFactory2 factory = (XMLInputFactory2) XMLInputFactory.newInstance();
-    assert factory instanceof WstxInputFactory;
-    factory.configureForXmlConformance();
-    factory.setProperty(XMLInputFactory.IS_COALESCING, true);
-
-    String html = new StringBuilder()
-        .append("<node>\n")
-        .append("  <p> some text </p>\n")
-        .append("  <p><q>text</q></p>\n")
-        .append("  <p>some <b>text</b> <insert param-id=\"param-id\"/>.</p>\n")
-        .append("  <h1>Example</h1>\n")
-        .append("  <p><a href=\"link\">text</a></p>\n")
-        .append("  <ul>\n")
-        .append("    <li>a <strong>list item</strong></li>\n")
-        .append("    <li>another <i>list item</i></li>\n")
-        .append("  </ul>\n")
-        .append(" <table>\n")
-        .append(" <tr><th>Heading 1</th></tr>\n")
-        .append(" <tr><td><q>data1</q> <insert param-id=\"insert\" /></td></tr>\n")
-        .append(" </table>\n")
-        .append("  <p>Some <em>more</em> <strong>text</strong><img alt=\"alt\" src=\"src\"/></p>\n")
-        .append("</node>\n")
-        .toString();
-
-    XMLEventReader2 reader = (XMLEventReader2) factory.createXMLEventReader(new StringReader(html));
-
-    CharSequence startDocument = XmlEventUtil.toString(reader.nextEvent());
-    LOGGER.atDebug().log("StartDocument: {}", startDocument);
-
-    CharSequence startElement = XmlEventUtil.toString(reader.nextEvent());
-    LOGGER.atDebug().log("StartElement: {}", startElement);
-
-    assertDoesNotThrow(() -> {
-      MarkupMultiline markupString = XmlMarkupParser.instance().parseMarkupMultiline(reader);
-      AstCollectingVisitor.asString(markupString.getDocument());
-      // System.out.println(html);
-      // System.out.println(visitor.getAst());
-      // System.out.println(markupString.toMarkdown());
-
-    });
-  }
-
-  @Test
-  void emptyParagraphTest() throws XMLStreamException {
-    final String html = new StringBuilder()
-        .append("<node>\n")
-        .append("  <p/>\n")
-        .append("</node>\n")
-        .toString();
-
-    XMLInputFactory2 factory = (XMLInputFactory2) XMLInputFactory.newInstance();
-    assert factory instanceof WstxInputFactory;
-    factory.configureForXmlConformance();
-    factory.setProperty(XMLInputFactory.IS_COALESCING, true);
-    XMLEventReader2 reader = (XMLEventReader2) factory.createXMLEventReader(new StringReader(html));
-
-    CharSequence startDocument = XmlEventUtil.toString(reader.nextEvent());
-    LOGGER.atDebug().log("StartDocument: {}", startDocument);
-
-    CharSequence startElement = XmlEventUtil.toString(reader.nextEvent());
-    LOGGER.atDebug().log("StartElement: {}", startElement);
-
-    assertDoesNotThrow(() -> {
-      MarkupMultiline ms = XmlMarkupParser.instance().parseMarkupMultiline(reader);
-      LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
-      LOGGER.atDebug().log("HTML: {}", ms.toXHtml(""));
-      LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
-    });
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.datatype.markup.flexmark;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import com.ctc.wstx.stax.WstxInputFactory;
+
+import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.codehaus.stax2.XMLEventReader2;
+import org.codehaus.stax2.XMLInputFactory2;
+import org.junit.jupiter.api.Test;
+
+import java.io.StringReader;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+
+class MarkupParserTest {
+  private static final Logger LOGGER = LogManager.getLogger(MarkupParserTest.class);
+
+  @Test
+  void test() throws XMLStreamException {
+    XMLInputFactory2 factory = (XMLInputFactory2) XMLInputFactory.newInstance();
+    assert factory instanceof WstxInputFactory;
+    factory.configureForXmlConformance();
+    factory.setProperty(XMLInputFactory.IS_COALESCING, true);
+
+    String html = new StringBuilder()
+        .append("<node>\n")
+        .append("  <p> some text </p>\n")
+        .append("  <p><q>text</q></p>\n")
+        .append("  <p>some <b>text</b> <insert param-id=\"param-id\"/>.</p>\n")
+        .append("  <h1>Example</h1>\n")
+        .append("  <p><a href=\"link\">text</a></p>\n")
+        .append("  <ul>\n")
+        .append("    <li>a <strong>list item</strong></li>\n")
+        .append("    <li>another <i>list item</i></li>\n")
+        .append("  </ul>\n")
+        .append(" <table>\n")
+        .append(" <tr><th>Heading 1</th></tr>\n")
+        .append(" <tr><td><q>data1</q> <insert param-id=\"insert\" /></td></tr>\n")
+        .append(" </table>\n")
+        .append("  <p>Some <em>more</em> <strong>text</strong><img alt=\"alt\" src=\"src\"/></p>\n")
+        .append("</node>\n")
+        .toString();
+
+    XMLEventReader2 reader = (XMLEventReader2) factory.createXMLEventReader(new StringReader(html));
+
+    CharSequence startDocument = XmlEventUtil.toString(reader.nextEvent());
+    LOGGER.atDebug().log("StartDocument: {}", startDocument);
+
+    CharSequence startElement = XmlEventUtil.toString(reader.nextEvent());
+    LOGGER.atDebug().log("StartElement: {}", startElement);
+
+    assertDoesNotThrow(() -> {
+      MarkupMultiline markupString = XmlMarkupParser.instance().parseMarkupMultiline(reader);
+      AstCollectingVisitor.asString(markupString.getDocument());
+      // System.out.println(html);
+      // System.out.println(visitor.getAst());
+      // System.out.println(markupString.toMarkdown());
+
+    });
+  }
+
+  @Test
+  void emptyParagraphTest() throws XMLStreamException {
+    final String html = new StringBuilder()
+        .append("<node>\n")
+        .append("  <p/>\n")
+        .append("</node>\n")
+        .toString();
+
+    XMLInputFactory2 factory = (XMLInputFactory2) XMLInputFactory.newInstance();
+    assert factory instanceof WstxInputFactory;
+    factory.configureForXmlConformance();
+    factory.setProperty(XMLInputFactory.IS_COALESCING, true);
+    XMLEventReader2 reader = (XMLEventReader2) factory.createXMLEventReader(new StringReader(html));
+
+    CharSequence startDocument = XmlEventUtil.toString(reader.nextEvent());
+    LOGGER.atDebug().log("StartDocument: {}", startDocument);
+
+    CharSequence startElement = XmlEventUtil.toString(reader.nextEvent());
+    LOGGER.atDebug().log("StartElement: {}", startElement);
+
+    assertDoesNotThrow(() -> {
+      MarkupMultiline ms = XmlMarkupParser.instance().parseMarkupMultiline(reader);
+      LOGGER.atDebug().log("AST: {}", AstCollectingVisitor.asString(ms.getDocument()));
+      LOGGER.atDebug().log("HTML: {}", ms.toXHtml(""));
+      LOGGER.atDebug().log("Markdown: {}", ms.toMarkdown());
+    });
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ExpressionTestBase.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ExpressionTestBase.java
index 745ec8ca0..e3632bd55 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ExpressionTestBase.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ExpressionTestBase.java
@@ -46,6 +46,11 @@ public class ExpressionTestBase {
   @RegisterExtension
   private final Mockery context = new JUnit5Mockery();
 
+  /**
+   * Get the mocking context.
+   *
+   * @return the mocking context
+   */
   @NonNull
   protected Mockery getContext() {
     return context;
@@ -60,13 +65,18 @@ protected Mockery getContext() {
   protected static DynamicContext newDynamicContext() {
     URI baseUri = ObjectUtils.notNull(new File("").getAbsoluteFile().toURI());
 
-    return StaticContext.builder()
+    return new DynamicContext(StaticContext.builder()
         .baseUri(baseUri)
-        .build().dynamicContext();
+        .build());
   }
 
+  /**
+   * Get a mocked document node item.
+   *
+   * @return the mocked node item
+   */
   @NonNull
-  protected IDocumentNodeItem newDocumentNodeContext() {
+  protected IDocumentNodeItem newDocumentNodeMock() {
     IDocumentNodeItem retval = getContext().mock(IDocumentNodeItem.class);
     assert retval != null;
 
@@ -82,8 +92,16 @@ protected IDocumentNodeItem newDocumentNodeContext() {
     return retval;
   }
 
+  /**
+   * Get a mocked node item.
+   *
+   * @param mockName
+   *          the name of the mocked object
+   *
+   * @return the mocked node item
+   */
   @NonNull
-  protected INodeItem newNonDocumentNodeContext(@NonNull String mockName) {
+  protected INodeItem newNonDocumentNodeMock(@NonNull String mockName) {
     INodeItem retval = getContext().mock(INodeItem.class, mockName);
     assert retval != null;
 
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ISequenceTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ISequenceTest.java
new file mode 100644
index 000000000..437b7e645
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/ISequenceTest.java
@@ -0,0 +1,55 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+class ISequenceTest {
+
+  @Test
+  void testGetFirstNonSingleton() {
+    assertAll(
+        () -> assertEquals(integer(1), ISequence.of(integer(1), integer(2)).getFirstItem(false)),
+        () -> assertEquals(integer(3), ISequence.of(integer(3)).getFirstItem(false)),
+        () -> assertNull(ISequence.of().getFirstItem(false)));
+  }
+
+  @Test
+  void testGetFirstSingleton() {
+    assertAll(
+        () -> assertThrows(InvalidTypeMetapathException.class,
+            () -> ISequence.of(integer(1), integer(2)).getFirstItem(true)),
+        () -> assertEquals(integer(3), ISequence.of(integer(3)).getFirstItem(true)),
+        () -> assertNull(ISequence.of().getFirstItem(true)));
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/MetapathExpressionTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/MetapathExpressionTest.java
index 23bb2182e..a4a4c8a45 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/MetapathExpressionTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/MetapathExpressionTest.java
@@ -90,6 +90,6 @@ void test() {
     assertNotNull(result, "null result");
     assertTrue(!result.isEmpty(), "result was empty");
     assertEquals(1, result.size(), "unexpected size");
-    assertEquals(true, ((IBooleanItem) result.asList().iterator().next()).toBoolean(), "unexpected result");
+    assertEquals(true, ((IBooleanItem) result.getValue().iterator().next()).toBoolean(), "unexpected result");
   }
 }
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/TestUtils.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/TestUtils.java
index 65da46bd5..2e154b3f9 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/TestUtils.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/TestUtils.java
@@ -26,8 +26,8 @@
 
 package gov.nist.secauto.metaschema.core.metapath;
 
-import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDayTimeDurationItem;
@@ -35,52 +35,185 @@
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IYearMonthDurationItem;
-import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.MathContext;
 import java.net.URI;
-import java.util.List;
+import java.util.Map;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
 public final class TestUtils {
-  private TestUtils() {
-    // disable construction
+  /**
+   * Create an empty sequence.
+   *
+   * @param <T>
+   *          the item Java type contained within the sequence
+   * @return the sequence
+   */
+  @NonNull
+  public static <T extends IItem> ISequence<T> sequence() {
+    return ISequence.of();
+  }
+
+  /**
+   * Create a sequence containing the provided items.
+   *
+   * @param <T>
+   *          the item Java type contained within the sequence
+   * @param items
+   *          the items to add to the sequence
+   * @return the sequence
+   */
+  @SafeVarargs
+  @NonNull
+  public static <T extends IItem> ISequence<T> sequence(@NonNull T... items) {
+    return ISequence.of(items);
+  }
+
+  /**
+   * Create an empty array item.
+   *
+   * @param <T>
+   *          the item Java type contained within the array item
+   * @return the array item
+   */
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> array() {
+    return IArrayItem.of();
+  }
+
+  /**
+   * Create a array item containing the provided items.
+   *
+   * @param <T>
+   *          the item Java type contained within the array item
+   * @param items
+   *          the items to add to the array item
+   * @return the array item
+   */
+  @SafeVarargs
+  @NonNull
+  public static <T extends ICollectionValue> IArrayItem<T> array(@NonNull T... items) {
+    return IArrayItem.of(items);
+  }
+
+  /**
+   * Create a map item containing the provided entries.
+   *
+   * @param <T>
+   *          the entry value Java type contained within the map item
+   * @param entries
+   *          the entries to add to the map item
+   * @return the map item
+   */
+  @SafeVarargs
+  @NonNull
+  public static <T extends ICollectionValue> IMapItem<T> map(@NonNull Map.Entry<IMapKey, T>... entries) {
+    return IMapItem.ofEntries(entries);
   }
 
+  /**
+   * Create a map entry using the provided key and value.
+   *
+   * @param <T>
+   *          the entry value Java type
+   * @param key
+   *          the entry key
+   * @param value
+   *          the entry value
+   * @return the map entry
+   */
+  @NonNull
+  public static <T extends ICollectionValue> Map.Entry<IMapKey, T> entry(
+      @NonNull IAnyAtomicItem key,
+      @NonNull T value) {
+    return IMapItem.entry(key, value);
+  }
+
+  /**
+   * Create a boolean item using the provided value.
+   *
+   * @param value
+   *          the boolean value
+   * @return the boolean item
+   */
   @NonNull
   public static IBooleanItem bool(boolean value) {
     return IBooleanItem.valueOf(value);
   }
 
+  /**
+   * Create a decimal item using the provided value.
+   *
+   * @param value
+   *          the decimal value
+   * @return the decimal item
+   */
   public static IDecimalItem decimal(@NonNull String value) {
     return IDecimalItem.valueOf(new BigDecimal(value, MathContext.DECIMAL64));
   }
 
+  /**
+   * Create a decimal item using the provided value.
+   *
+   * @param value
+   *          the decimal value
+   * @return the decimal item
+   */
   @NonNull
   public static IDecimalItem decimal(int value) {
     return IDecimalItem.valueOf(value);
   }
 
+  /**
+   * Create a decimal item using the provided value.
+   *
+   * @param value
+   *          the decimal value
+   * @return the decimal item
+   */
   @NonNull
   public static IDecimalItem decimal(double value) {
     return IDecimalItem.valueOf(value);
   }
 
+  /**
+   * Create an integer item using the provided value.
+   *
+   * @param value
+   *          the integer value
+   * @return the integer item
+   */
   @NonNull
   public static IIntegerItem integer(int value) {
     return IIntegerItem.valueOf(ObjectUtils.notNull(BigInteger.valueOf(value)));
   }
 
+  /**
+   * Create a string item using the provided value.
+   *
+   * @param value
+   *          the string value
+   * @return the string item
+   */
   @NonNull
   public static IStringItem string(@NonNull String value) {
     return IStringItem.valueOf(value);
   }
 
+  /**
+   * Create a uri item using the provided value.
+   *
+   * @param value
+   *          the uri value
+   * @return the uri item
+   */
   @NonNull
   public static IAnyUriItem uri(@NonNull String value) {
     URI uri = URI.create(value);
@@ -88,30 +221,33 @@ public static IAnyUriItem uri(@NonNull String value) {
     return IAnyUriItem.valueOf(uri);
   }
 
+  /**
+   * Create a duration item using the provided value indicating the years, months,
+   * and days of the duration.
+   *
+   * @param value
+   *          the duration value
+   * @return the duration item
+   */
   @NonNull
   public static IYearMonthDurationItem yearMonthDuration(@NonNull String value) {
     return IYearMonthDurationItem.valueOf(value);
   }
 
+  /**
+   * Create a duration item using the provided value indicating the seconds and
+   * nanoseconds of the duration.
+   *
+   * @param value
+   *          the duration value
+   * @return the duration item
+   */
   @NonNull
   public static IDayTimeDurationItem dayTimeDuration(@NonNull String value) {
     return IDayTimeDurationItem.valueOf(value);
   }
 
-  @SuppressWarnings("unchecked")
-  public static <R extends IItem> ISequence<R> executeFunction(
-      @NonNull IFunction function,
-      @Nullable DynamicContext dynamicContext,
-      @Nullable ISequence<?> focus,
-      List<ISequence<?>> arguments) {
-
-    DynamicContext context = dynamicContext == null ? StaticContext.instance().dynamicContext() : dynamicContext;
-    ISequence<?> focusSeqence = function.isFocusDepenent()
-        ? ObjectUtils.requireNonNull(focus, "Function call requires a focus")
-        : ISequence.empty();
-    return (ISequence<R>) function.execute(
-        arguments == null ? CollectionUtil.emptyList() : arguments,
-        context,
-        focusSeqence);
+  private TestUtils() {
+    // disable construction
   }
 }
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/ArrowExpressionTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/ArrowExpressionTest.java
index ba0fde5c8..67b7689bb 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/ArrowExpressionTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/ArrowExpressionTest.java
@@ -28,7 +28,6 @@
 
 import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool;
 import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
-import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
@@ -47,7 +46,7 @@ class ArrowExpressionTest
     extends ExpressionTestBase {
   private static Stream<Arguments> provideValues() { // NOPMD - false positive
     return Stream.of(
-        Arguments.of(ISequence.of(string("true")), "true() => string()"),
+        // Arguments.of(ISequence.of(string("true")), "true() => string()"),
         Arguments.of(ISequence.of(bool(false)), "() => exists()"),
         Arguments.of(ISequence.of(integer(3)), "(1, 2) => sum()"));
   }
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCstVisitorTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCstVisitorTest.java
index 90d253a10..c483d2995 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCstVisitorTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCstVisitorTest.java
@@ -53,7 +53,6 @@
 import gov.nist.secauto.metaschema.core.metapath.cst.comparison.GeneralComparison;
 import gov.nist.secauto.metaschema.core.metapath.cst.comparison.ValueComparison;
 import gov.nist.secauto.metaschema.core.metapath.function.ComparisonFunctions;
-import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
@@ -63,6 +62,7 @@
 import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IRootAssemblyNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.MockNodeItemFactory;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
@@ -79,10 +79,27 @@
 import java.util.List;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 @SuppressWarnings("PMD.TooManyStaticImports")
 class BuildCstVisitorTest {
+  @NonNull
+  private static final URI NS_URI = ObjectUtils.notNull(URI.create("http://example.com/ns"));
+  @NonNull
+  private static final String NS = ObjectUtils.notNull(NS_URI.toASCIIString());
+  @NonNull
+  private static final QName ROOT = new QName(NS, "root");
+  @NonNull
+  private static final QName FIELD1 = new QName(NS, "field1");
+  @NonNull
+  private static final QName FIELD2 = new QName(NS, "field2");
+  @NonNull
+  private static final QName UUID = new QName(NS, "uuid");
+  @NonNull
+  private static final QName FLAG = new QName("flag");
+
   @RegisterExtension
   Mockery context = new JUnit5Mockery();
 
@@ -90,19 +107,21 @@ class BuildCstVisitorTest {
   @NonNull
   private IDocumentNodeItem newTestDocument() {
     MockNodeItemFactory factory = new MockNodeItemFactory(context);
-    return factory.document(URI.create("http://example.com/content"), "root",
+
+    return factory.document(URI.create("http://example.com/content"), ROOT,
         List.of(
-            factory.flag("uuid", IUuidItem.random())),
+            factory.flag(UUID, IUuidItem.random())),
         List.of(
-            factory.field("field1", IStringItem.valueOf("field1")),
-            factory.field("field2", IStringItem.valueOf("field2"), // NOPMD
-                List.of(factory.flag("flag", IStringItem.valueOf("field2-flag"))))));
+            factory.field(FIELD1, IStringItem.valueOf("field1")),
+            factory.field(FIELD2, IStringItem.valueOf("field2"), // NOPMD
+                List.of(factory.flag(FLAG, IStringItem.valueOf("field2-flag"))))));
   }
 
   @NonNull
-  private static DynamicContext newDynamicContext() {
+  private static StaticContext newStaticContext() {
     return StaticContext.builder()
-        .build().dynamicContext();
+        .defaultModelNamespace(NS_URI)
+        .build();
   }
 
   private static IExpression parseExpression(@NonNull String path) {
@@ -116,128 +135,147 @@ private static IExpression parseExpression(@NonNull String path) {
     // ParseTreePrinter cstPrinter = new ParseTreePrinter(System.out);
     // cstPrinter.print(tree, Arrays.asList(parser.getRuleNames()));
 
-    return new BuildCSTVisitor().visit(tree);
+    return new BuildCSTVisitor(StaticContext.instance()).visit(tree);
   }
 
   @Test
   void testAbbreviatedParentAxis() {
+    StaticContext staticContext = newStaticContext();
     // compile expression
     String path = "../field2";
-    IExpression ast = parseExpression(path);
+    MetapathExpression expr = MetapathExpression.compile(path, staticContext);
 
     // select starting node
     IDocumentNodeItem document = newTestDocument();
-    IFieldNodeItem field = MetapathExpression.compile("/root/field1").evaluateAs(document, ResultType.NODE);
+    IFieldNodeItem field
+        = MetapathExpression.compile("/root/field1", staticContext).evaluateAs(document, ResultType.NODE);
     assert field != null;
 
     // evaluate
-    ISequence<?> result = ast.accept(newDynamicContext(), ISequence.of(field));
-    assertThat(result.asList(), contains(
+    ISequence<?> result = expr.evaluate(field);
+    assertThat(result.getValue(), contains(
         allOf(
             instanceOf(IFieldNodeItem.class),
-            hasProperty("name", equalTo("field2"))))); // NOPMD
+            hasProperty("name", equalTo(FIELD2))))); // NOPMD
 
   }
 
   @Test
   void testParentAxisMatch() {
+    StaticContext staticContext = newStaticContext();
+
     // select starting node
     IDocumentNodeItem document = newTestDocument();
-    IFieldNodeItem field = MetapathExpression.compile("/root/field1").evaluateAs(document, ResultType.NODE);
+    IFieldNodeItem field = MetapathExpression.compile("/root/field1", staticContext)
+        .evaluateAs(document, ResultType.NODE);
     assert field != null;
 
     // compile expression
-    IItem result = MetapathExpression.compile("parent::root").evaluateAs(field, ResultType.NODE);
+    IItem result = MetapathExpression.compile("parent::root", staticContext)
+        .evaluateAs(field, ResultType.NODE);
     assert result != null;
 
     assertAll(
         () -> assertInstanceOf(IRootAssemblyNodeItem.class, result),
-        () -> assertEquals("root", ((IRootAssemblyNodeItem) result).getName()));
+        () -> assertEquals(ROOT, ((IRootAssemblyNodeItem) result).getName()));
   }
 
   @Test
   void testParentAxisNonMatch() {
+    StaticContext staticContext = newStaticContext();
+
     // select starting node
     IDocumentNodeItem document = newTestDocument();
-    IFieldNodeItem field = MetapathExpression.compile("/root/field1").evaluateAs(document, ResultType.NODE);
+    IFieldNodeItem field = MetapathExpression.compile("/root/field1", staticContext)
+        .evaluateAs(document, ResultType.NODE);
     assert field != null;
 
     // compile expression
     String path = "parent::other";
-    IExpression ast = parseExpression(path);
+    MetapathExpression expr = MetapathExpression.compile(path, staticContext);
 
     // evaluate
-    ISequence<?> result = ast.accept(newDynamicContext(), ISequence.of(field));
+    ISequence<?> result = expr.evaluate(field);
     assertTrue(result.isEmpty());
   }
 
   @Test
   void testParentAxisDocument() {
+    StaticContext staticContext = newStaticContext();
+
     // compile expression
     String path = "parent::other";
-    IExpression ast = parseExpression(path);
+    MetapathExpression expr = MetapathExpression.compile(path, staticContext);
 
     // select starting node
     IDocumentNodeItem document = newTestDocument();
 
     // evaluate
-    ISequence<?> result = ast.accept(newDynamicContext(), ISequence.of(document));
+    ISequence<?> result = expr.evaluate(document);
     assertTrue(result.isEmpty());
   }
 
   @Test
   void testAbbreviatedForwardAxisModelName() {
+    StaticContext staticContext = newStaticContext();
+
     String path = "./root";
-    IExpression ast = parseExpression(path);
+    MetapathExpression expr = MetapathExpression.compile(path, staticContext);
 
     // select starting node
     IDocumentNodeItem document = newTestDocument();
 
     // evaluate
-    ISequence<?> result = ast.accept(newDynamicContext(), ISequence.of(document));
-    assertThat(result.asList(), contains(
+    ISequence<?> result = expr.evaluate(document);
+    assertThat(result.getValue(), contains(
         allOf(
             instanceOf(IRootAssemblyNodeItem.class),
-            hasProperty("name", equalTo("root")))));
+            hasProperty("name", equalTo(ROOT)))));
   }
 
   @Test
   void testAbbreviatedForwardAxisFlagName() {
+    StaticContext staticContext = newStaticContext();
+
     String path = "./@flag";
-    IExpression ast = parseExpression(path);
+    MetapathExpression expr = MetapathExpression.compile(path, staticContext);
 
     // select starting node
     IDocumentNodeItem document = newTestDocument();
-    IFieldNodeItem field = MetapathExpression.compile("/root/field2").evaluateAs(document, ResultType.NODE);
+    IFieldNodeItem field = MetapathExpression.compile("/root/field2", staticContext)
+        .evaluateAs(document, ResultType.NODE);
     assert field != null;
 
     // evaluate
-    ISequence<?> result = ast.accept(newDynamicContext(), ISequence.of(field));
-    assertThat(result.asList(), contains(
+    ISequence<?> result = expr.evaluate(field);
+    assertThat(result.getValue(), contains(
         allOf(
             instanceOf(IFlagNodeItem.class),
-            hasProperty("name", equalTo("flag")))));
+            hasProperty("name", equalTo(FLAG)))));
   }
 
   @Test
   void testForwardstepChild() {
+    StaticContext staticContext = newStaticContext();
+
     String path = "child::*";
-    IExpression ast = parseExpression(path);
+    MetapathExpression expr = MetapathExpression.compile(path, staticContext);
 
     // select starting node
     IDocumentNodeItem document = newTestDocument();
-    IRootAssemblyNodeItem root = MetapathExpression.compile("/root").evaluateAs(document, ResultType.NODE);
+    IRootAssemblyNodeItem root = MetapathExpression.compile("/root", staticContext)
+        .evaluateAs(document, ResultType.NODE, new DynamicContext(staticContext));
     assert root != null;
 
     // evaluate
-    ISequence<?> result = ast.accept(newDynamicContext(), ISequence.of(root));
-    assertThat(result.asList(), contains(
+    ISequence<?> result = expr.evaluate(root);
+    assertThat(result.getValue(), contains(
         allOf(
             instanceOf(IFieldNodeItem.class),
-            hasProperty("name", equalTo("field1"))), // NOPMD
+            hasProperty("name", equalTo(FIELD1))), // NOPMD
         allOf(
             instanceOf(IFieldNodeItem.class),
-            hasProperty("name", equalTo("field2"))))); // NOPMD
+            hasProperty("name", equalTo(FIELD2))))); // NOPMD
   }
 
   static Stream<Arguments> testComparison() {
@@ -283,8 +321,8 @@ void testAnd(@NonNull String metapath, @NonNull IBooleanItem expectedResult) {
     IExpression ast = parseExpression(metapath);
 
     IDocumentNodeItem document = newTestDocument();
-    ISequence<?> result = ast.accept(newDynamicContext(), ISequence.of(document));
-    IItem resultItem = FunctionUtils.getFirstItem(result, false);
+    ISequence<?> result = ast.accept(new DynamicContext(), ISequence.of(document));
+    IItem resultItem = result.getFirstItem(false);
     assertAll(
         () -> assertEquals(And.class, ast.getClass()),
         () -> assertNotNull(resultItem),
@@ -308,8 +346,8 @@ void testIf(@NonNull String metapath, @NonNull IBooleanItem expectedResult) {
     IExpression ast = parseExpression(metapath);
 
     IDocumentNodeItem document = newTestDocument();
-    ISequence<?> result = ast.accept(newDynamicContext(), ISequence.of(document));
-    IItem resultItem = FunctionUtils.getFirstItem(result, false);
+    ISequence<?> result = ast.accept(new DynamicContext(), ISequence.of(document));
+    IItem resultItem = result.getFirstItem(false);
     assertAll(
         () -> assertEquals(If.class, ast.getClass()),
         () -> assertNotNull(resultItem),
@@ -339,7 +377,7 @@ void testFor(@NonNull String metapath, @NonNull ISequence<?> expectedResult) {
     IExpression ast = parseExpression(metapath);
 
     IDocumentNodeItem document = newTestDocument();
-    ISequence<?> result = ast.accept(newDynamicContext(), ISequence.of(document));
+    ISequence<?> result = ast.accept(new DynamicContext(), ISequence.of(document));
     assertAll(
         () -> assertEquals(For.class, ast.getClass()),
         () -> assertNotNull(result),
@@ -366,7 +404,7 @@ void testSimpleMap(@NonNull String metapath, @NonNull ISequence<?> expectedResul
     IExpression ast = parseExpression(metapath);
 
     IDocumentNodeItem document = newTestDocument();
-    ISequence<?> result = ast.accept(newDynamicContext(), ISequence.of(document));
+    ISequence<?> result = ast.accept(new DynamicContext(), ISequence.of(document));
     assertAll(
         () -> assertEquals(SimpleMap.class, ast.getClass()),
         () -> assertNotNull(result),
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/EQNameUtilsTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/EQNameUtilsTest.java
new file mode 100644
index 000000000..357417b34
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/EQNameUtilsTest.java
@@ -0,0 +1,110 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.cst;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.EQNameUtils;
+import gov.nist.secauto.metaschema.core.metapath.EQNameUtils.IEQNamePrefixResolver;
+import gov.nist.secauto.metaschema.core.metapath.StaticContext;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import javax.xml.namespace.QName;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class EQNameUtilsTest {
+  private static final StaticContext STATIC_CONTEXT = StaticContext.builder()
+      .namespace("prefix", "http://example.com/ns/prefix")
+      .defaultFunctionNamespace("http://example.com/ns/function")
+      .defaultModelNamespace("http://example.com/ns/model")
+      .build();
+
+  static Stream<Arguments> provideValues() {
+    return Stream.of(
+        Arguments.of(
+            "prefix:local-name",
+            new QName("http://example.com/ns/prefix", "local-name"),
+            STATIC_CONTEXT.getFunctionPrefixResolver()),
+        Arguments.of(
+            "prefix:local-name",
+            new QName("http://example.com/ns/prefix", "local-name"),
+            STATIC_CONTEXT.getFlagPrefixResolver()),
+        Arguments.of(
+            "prefix:local-name",
+            new QName("http://example.com/ns/prefix", "local-name"),
+            STATIC_CONTEXT.getVariablePrefixResolver()),
+        Arguments.of(
+            "prefix:local-name",
+            new QName("http://example.com/ns/prefix", "local-name"),
+            STATIC_CONTEXT.getModelPrefixResolver()),
+        Arguments.of(
+            "local-name",
+            new QName("http://example.com/ns/function", "local-name"),
+            STATIC_CONTEXT.getFunctionPrefixResolver()),
+        Arguments.of(
+            "local-name",
+            new QName("local-name"),
+            STATIC_CONTEXT.getFlagPrefixResolver()),
+        Arguments.of(
+            "local-name",
+            new QName("local-name"),
+            STATIC_CONTEXT.getVariablePrefixResolver()),
+        Arguments.of(
+            "local-name",
+            new QName("http://example.com/ns/model", "local-name"),
+            STATIC_CONTEXT.getModelPrefixResolver()),
+        Arguments.of("Q{http://example.com/ns}local-name",
+            new QName("http://example.com/ns", "local-name"),
+            STATIC_CONTEXT.getFunctionPrefixResolver()),
+        Arguments.of("Q{http://example.com/ns}local-name",
+            new QName("http://example.com/ns", "local-name"),
+            STATIC_CONTEXT.getFlagPrefixResolver()),
+        Arguments.of("Q{http://example.com/ns}local-name",
+            new QName("http://example.com/ns", "local-name"),
+            STATIC_CONTEXT.getVariablePrefixResolver()),
+        Arguments.of("Q{http://example.com/ns}local-name",
+            new QName("http://example.com/ns", "local-name"),
+            STATIC_CONTEXT.getModelPrefixResolver()));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void test(
+      @NonNull String eqname,
+      @NonNull QName expected,
+      @NonNull IEQNamePrefixResolver resolver) {
+
+    QName actual = EQNameUtils.parseName(eqname, resolver);
+    assertEquals(expected, actual);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/FlagTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/FlagTest.java
index 973e29692..d642fdd9c 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/FlagTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/FlagTest.java
@@ -32,6 +32,7 @@
 import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
 import gov.nist.secauto.metaschema.core.metapath.cst.path.Flag;
+import gov.nist.secauto.metaschema.core.metapath.cst.path.NameTest;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IModelNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.NodeItemType;
@@ -41,6 +42,8 @@
 import org.jmock.Mockery;
 import org.junit.jupiter.api.Test;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 class FlagTest
@@ -57,7 +60,7 @@ void testFlagWithName() {
     IFlagInstance instance = context.mock(IFlagInstance.class);
     IFlagNodeItem flagNode = context.mock(IFlagNodeItem.class);
 
-    String flagName = "test";
+    QName flagName = new QName("test");
 
     context.checking(new Expectations() {
       { // NOPMD - intentional
@@ -77,7 +80,7 @@ void testFlagWithName() {
       }
     });
 
-    Flag expr = new Flag(new Name(flagName));
+    Flag expr = new Flag(new NameTest(flagName));
 
     ISequence<?> result = expr.accept(dynamicContext, ISequence.of(focusItem));
     assertEquals(ISequence.of(flagNode), result, "Sequence does not match");
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/PredicateTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/PredicateExpressionTest.java
similarity index 93%
rename from core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/PredicateTest.java
rename to core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/PredicateExpressionTest.java
index 8e485412d..9ea7db460 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/PredicateTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/PredicateExpressionTest.java
@@ -45,7 +45,7 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT")
-class PredicateTest
+class PredicateExpressionTest
     extends ExpressionTestBase {
 
   @Test
@@ -68,9 +68,9 @@ void testPredicateWithValues() {
         oneOf(stepExpr).accept(dynamicContext, ISequence.of(item));
         will(returnValue(stepResult));
 
-        atMost(1).of(stepResult).asStream();
+        atMost(1).of(stepResult).stream();
         will(returnValue(Stream.of(item)));
-        atMost(1).of(stepResult).asList();
+        atMost(1).of(stepResult).getValue();
         will(returnValue(CollectionUtil.singletonList(item)));
 
         allowing(item).getNodeItem();
@@ -83,7 +83,7 @@ void testPredicateWithValues() {
       }
     });
 
-    Predicate expr = new Predicate(stepExpr, predicates);
+    PredicateExpression expr = new PredicateExpression(stepExpr, predicates);
 
     ISequence<?> result = expr.accept(dynamicContext, ISequence.of(item));
     assertEquals(ISequence.of(item), result, "Sequence does not match");
@@ -109,9 +109,9 @@ void testPredicateWithoutValues() {
         oneOf(stepExpr).accept(dynamicContext, ISequence.of(item));
         will(returnValue(stepResult));
 
-        atMost(1).of(stepResult).asStream();
+        atMost(1).of(stepResult).stream();
         will(returnValue(Stream.of(item)));
-        atMost(1).of(stepResult).asList();
+        atMost(1).of(stepResult).getValue();
         will(returnValue(CollectionUtil.singletonList(item)));
 
         allowing(item).getNodeItem();
@@ -122,7 +122,7 @@ void testPredicateWithoutValues() {
       }
     });
 
-    Predicate expr = new Predicate(stepExpr, predicates);
+    PredicateExpression expr = new PredicateExpression(stepExpr, predicates);
 
     ISequence<?> result = expr.accept(dynamicContext, ISequence.of(item));
     assertEquals(ISequence.of(item), result, "Sequence does not match");
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/RootSlashOnlyTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/RootSlashOnlyTest.java
index efb946be2..b3da5559e 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/RootSlashOnlyTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/cst/RootSlashOnlyTest.java
@@ -42,7 +42,7 @@ class RootSlashOnlyTest
 
   @Test
   void testRootSlashOnlyPathUsingDocument() {
-    IDocumentNodeItem nodeContext = newDocumentNodeContext();
+    IDocumentNodeItem nodeContext = newDocumentNodeMock();
     assert nodeContext != null;
 
     RootSlashOnlyPath expr = new RootSlashOnlyPath();
@@ -54,7 +54,7 @@ void testRootSlashOnlyPathUsingDocument() {
 
   @Test
   void testRootSlashOnlyPathUsingNonDocument() {
-    INodeItem item = newNonDocumentNodeContext("non-document");
+    INodeItem item = newNonDocumentNodeMock("non-document");
     assert item != null;
 
     RootSlashOnlyPath expr = new RootSlashOnlyPath();
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppendTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppendTest.java
new file mode 100644
index 000000000..8f82ccc00
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayAppendTest.java
@@ -0,0 +1,65 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArrayAppendTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            array(string("a"), string("b"), string("c"), string("d")),
+            "array:append([\"a\", \"b\", \"c\"], \"d\")"),
+        Arguments.of(
+            array(string("a"), string("b"), string("c"), sequence(string("d"), string("e"))),
+            "array:append([\"a\", \"b\", \"c\"], (\"d\", \"e\"))"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IItem expected, @NonNull String metapath) {
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlattenTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlattenTest.java
new file mode 100644
index 000000000..e99c4f84c
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayFlattenTest.java
@@ -0,0 +1,68 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArrayFlattenTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            sequence(integer(1), integer(4), integer(6), integer(5), integer(3)),
+            "array:flatten([1, 4, 6, 5, 3])"),
+        Arguments.of(
+            sequence(integer(1), integer(2), integer(5), integer(10), integer(11), integer(12), integer(13)),
+            "array:flatten(([1, 2, 5], [[10, 11], 12], [], 13))"),
+        Arguments.of(
+            sequence(integer(1), integer(0), integer(1), integer(1), integer(0), integer(1), integer(0), integer(0)),
+            "array:flatten([(1,0), (1,1), (0,1), (0,0)])"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull ISequence<?> expected, @NonNull String metapath) {
+
+    ISequence<?> result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.SEQUENCE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGetTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGetTest.java
new file mode 100644
index 000000000..57af23151
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayGetTest.java
@@ -0,0 +1,65 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArrayGetTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            string("b"),
+            "[\"a\", \"b\", \"c\"] => array:get(2)"),
+        Arguments.of(
+            array(string("b"), string("c")),
+            "[\"a\", [\"b\", \"c\"]] => array:get(2)"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IItem expected, @NonNull String metapath) {
+
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHeadTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHeadTest.java
new file mode 100644
index 000000000..66df25832
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayHeadTest.java
@@ -0,0 +1,71 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArrayHeadTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            sequence(integer(5)),
+            "array:head([5, 6, 7, 8])"),
+        Arguments.of(
+            sequence(array(string("a"), string("b"))),
+            "array:head([[\"a\", \"b\"], [\"c\", \"d\"]])"),
+        Arguments.of(
+            sequence(string("a"), string("b")),
+            "array:head([(\"a\", \"b\"), (\"c\", \"d\")])"));
+
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull ISequence<?> expected, @NonNull String metapath) {
+
+    ISequence<?> result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.SEQUENCE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java
new file mode 100644
index 000000000..6a686d5ec
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java
@@ -0,0 +1,68 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArrayInsertBeforeTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            array(string("a"), string("b"), sequence(string("x"), string("y")), string("c"), string("d")),
+            "array:insert-before([\"a\", \"b\", \"c\", \"d\"], 3, (\"x\", \"y\"))"),
+        Arguments.of(
+            array(string("a"), string("b"), string("c"), string("d"), sequence(string("x"), string("y"))),
+            "array:insert-before([\"a\", \"b\", \"c\", \"d\"], 5, (\"x\", \"y\"))"),
+        Arguments.of(
+            array(sequence(string("x"), string("y")), string("a"), string("b"), string("c"), string("d")),
+            "array:insert-before([\"a\", \"b\", \"c\", \"d\"], 1, (\"x\", \"y\"))"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IItem expected, @NonNull String metapath) {
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoinTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoinTest.java
new file mode 100644
index 000000000..7309db07d
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayJoinTest.java
@@ -0,0 +1,74 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArrayJoinTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            array(),
+            "array:join(())"),
+        Arguments.of(
+            array(integer(1), integer(2), integer(3)),
+            "array:join([1, 2, 3])"),
+        Arguments.of(
+            array(string("a"), string("b"), string("c"), string("d")),
+            "array:join(([\"a\", \"b\"], [\"c\", \"d\"]))"),
+        Arguments.of(
+            array(string("a"), string("b"), string("c"), string("d")),
+            "array:join(([\"a\", \"b\"], [\"c\", \"d\"], [ ]))"),
+        Arguments.of(
+            array(string("a"), string("b"), string("c"), string("d"), array(string("e"), string("f"))),
+            "array:join(([\"a\", \"b\"], [\"c\", \"d\"], [[\"e\", \"f\"]]))"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IItem expected, @NonNull String metapath) {
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPutTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPutTest.java
new file mode 100644
index 000000000..2858e416f
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayPutTest.java
@@ -0,0 +1,69 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArrayPutTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            array(string("a"), string("d"), string("c")),
+            "array:put([\"a\", \"b\", \"c\"], 2, \"d\")"),
+        Arguments.of(
+            array(string("a"), sequence(string("d"), string("e")), string("c")),
+            "array:put([\"a\", \"b\", \"c\"], 2, (\"d\", \"e\"))"),
+        Arguments.of(
+            array(array(string("d"), string("e"))),
+            "array:put([\"a\"], 1, [\"d\", \"e\"]) "));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IItem expected, @NonNull String metapath) {
+
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemoveTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemoveTest.java
new file mode 100644
index 000000000..a307a28ef
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayRemoveTest.java
@@ -0,0 +1,74 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArrayRemoveTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            array(string("b"), string("c"), string("d")),
+            "array:remove([\"a\", \"b\", \"c\", \"d\"], 1)"),
+        Arguments.of(
+            array(string("a"), string("c"), string("d")),
+            "array:remove([\"a\", \"b\", \"c\", \"d\"], 2)"),
+        Arguments.of(
+            array(),
+            "array:remove([\"a\"], 1)"),
+        Arguments.of(
+            array(string("d")),
+            "array:remove([\"a\", \"b\", \"c\", \"d\"], 1 to 3)"),
+        Arguments.of(
+            array(string("a"), string("b"), string("c"), string("d")),
+            "array:remove([\"a\", \"b\", \"c\", \"d\"], ())"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IItem expected, @NonNull String metapath) {
+
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverseTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverseTest.java
new file mode 100644
index 000000000..3b00aa95b
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayReverseTest.java
@@ -0,0 +1,72 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArrayReverseTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            array(string("d"), string("c"), string("b"), string("a")),
+            "array:reverse([\"a\", \"b\", \"c\", \"d\"])"),
+        Arguments.of(
+            array(sequence(string("c"), string("d")), sequence(string("a"), string("b"))),
+            "array:reverse([(\"a\", \"b\"), (\"c\", \"d\")])"),
+        Arguments.of(
+            array(sequence(integer(1), integer(2), integer(3), integer(4), integer(5))),
+            "array:reverse([(1 to 5)])"),
+        Arguments.of(
+            array(),
+            "array:reverse([])"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IItem expected, @NonNull String metapath) {
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySizeTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySizeTest.java
new file mode 100644
index 000000000..5d35f625e
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySizeTest.java
@@ -0,0 +1,71 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArraySizeTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            integer(3),
+            "array:size([\"a\", \"b\", \"c\"])"),
+        Arguments.of(
+            integer(2),
+            "array:size([\"a\", [\"b\", \"c\"]])"),
+        Arguments.of(
+            integer(0),
+            "array:size([ ])"),
+        Arguments.of(
+            integer(1),
+            "array:size([[ ]])"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IIntegerItem expected, @NonNull String metapath) {
+
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarrayTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarrayTest.java
new file mode 100644
index 000000000..33c32d711
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArraySubarrayTest.java
@@ -0,0 +1,79 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArraySubarrayTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            array(string("b"), string("c"), string("d")),
+            "array:subarray([\"a\", \"b\", \"c\", \"d\"], 2)"),
+        Arguments.of(
+            array(),
+            "array:subarray([\"a\", \"b\", \"c\", \"d\"], 5)"),
+        Arguments.of(
+            array(),
+            "array:subarray([\"a\", \"b\", \"c\", \"d\"], 2, 0)"),
+        Arguments.of(
+            array(string("b")),
+            "array:subarray([\"a\", \"b\", \"c\", \"d\"], 2, 1)"),
+        Arguments.of(
+            array(string("b"), string("c")),
+            "array:subarray([\"a\", \"b\", \"c\", \"d\"], 2, 2)"),
+        Arguments.of(
+            array(),
+            "array:subarray([\"a\", \"b\", \"c\", \"d\"], 5, 0)"),
+        Arguments.of(
+            array(),
+            "array:subarray([ ], 1, 0)"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IItem expected, @NonNull String metapath) {
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTailTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTailTest.java
new file mode 100644
index 000000000..15289ac37
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/ArrayTailTest.java
@@ -0,0 +1,70 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IArrayItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class ArrayTailTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            array(integer(6), integer(7), integer(8)),
+            "array:tail([5, 6, 7, 8])"),
+        Arguments.of(
+            array(),
+            "array:tail([5])"),
+        Arguments.of(
+            array(sequence(string("b"), string("c")), string("d")),
+            "array:tail([\"a\", (\"b\", \"c\"), \"d\"])"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IArrayItem<?> expected, @NonNull String metapath) {
+
+    IArrayItem<?> result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FunctionTestBase.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FunctionTestBase.java
index 8ab354787..121e4d561 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FunctionTestBase.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/FunctionTestBase.java
@@ -28,49 +28,36 @@
 
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
-import gov.nist.secauto.metaschema.core.metapath.TestUtils;
-import gov.nist.secauto.metaschema.core.metapath.function.FunctionService;
 import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
 import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.List;
 
-import javax.xml.namespace.QName;
-
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
 public class FunctionTestBase
     extends ExpressionTestBase {
 
-  public static void assertFunctionResult(
-      @NonNull QName functionName,
-      @NonNull ISequence<?> expectedResult,
-      List<ISequence<?>> arguments) {
-    assertFunctionResult(functionName, null, expectedResult, arguments);
-  }
-
-  public static void assertFunctionResult(
-      @NonNull QName functionName,
-      @Nullable ISequence<?> focus,
-      @NonNull ISequence<?> expectedResult,
-      List<ISequence<?>> arguments) {
-
-    List<ISequence<?>> usedArguments = arguments == null ? CollectionUtil.emptyList() : arguments;
-
-    IFunction function = FunctionService.getInstance().getFunction(functionName, usedArguments.size());
-
-    assertNotNull(function, String.format("Function '%s' not found.", functionName));
-
-    assertFunctionResultInternal(function, focus, expectedResult, usedArguments);
-  }
-
+  /**
+   * Assert that the execution of the provided function and arguments produce the
+   * desired results.
+   *
+   * @param function
+   *          the function to test
+   * @param expectedResult
+   *          the expected result produced by the function
+   * @param arguments
+   *          the function arguments to use for evaluation
+   */
   public static void assertFunctionResult(
       @NonNull IFunction function,
       @NonNull ISequence<?> expectedResult,
@@ -78,6 +65,19 @@ public static void assertFunctionResult(
     assertFunctionResult(function, null, expectedResult, arguments);
   }
 
+  /**
+   * Assert that the execution of the provided function and arguments produce the
+   * desired results.
+   *
+   * @param function
+   *          the function to test
+   * @param focus
+   *          the item focus to use for evaluation
+   * @param expectedResult
+   *          the expected result produced by the function
+   * @param arguments
+   *          the function arguments to use for evaluation
+   */
   public static void assertFunctionResult(
       @NonNull IFunction function,
       @Nullable ISequence<?> focus,
@@ -86,11 +86,14 @@ public static void assertFunctionResult(
 
     List<ISequence<?>> usedArguments = arguments == null ? CollectionUtil.emptyList() : arguments;
 
-    QName functionName = function.getQName();
-
-    IFunction resolvedFunction = FunctionService.getInstance().getFunction(functionName, usedArguments.size());
-
-    assertNotNull(resolvedFunction, String.format("Function '%s' not found in function service.", functionName));
+    // QName functionName = function.getQName();
+    //
+    // IFunction resolvedFunction =
+    // FunctionService.getInstance().getFunction(functionName,
+    // usedArguments.size());
+    //
+    // assertNotNull(resolvedFunction, String.format("Function '%s' not found in
+    // function service.", functionName));
 
     assertFunctionResultInternal(function, focus, expectedResult, usedArguments);
   }
@@ -100,7 +103,7 @@ private static void assertFunctionResultInternal(
       @Nullable ISequence<?> focus,
       @NonNull ISequence<?> expectedResult,
       List<ISequence<?>> arguments) {
-    ISequence<INumericItem> result = TestUtils.executeFunction(
+    ISequence<INumericItem> result = FunctionTestBase.executeFunction(
         function,
         newDynamicContext(),
         focus,
@@ -109,8 +112,25 @@ private static void assertFunctionResultInternal(
     assertAll(
         () -> assertEquals(expectedResult, result),
         () -> assertEquals(
-            FunctionUtils.getTypes(expectedResult.asList()),
-            FunctionUtils.getTypes(result.asList())));
+            FunctionUtils.getTypes(expectedResult.getValue()),
+            FunctionUtils.getTypes(result.getValue())));
+
+  }
+
+  @SuppressWarnings("unchecked")
+  private static <R extends IItem> ISequence<R> executeFunction(
+      @NonNull IFunction function,
+      @Nullable DynamicContext dynamicContext,
+      @Nullable ISequence<?> focus,
+      List<ISequence<?>> arguments) {
 
+    DynamicContext context = dynamicContext == null ? new DynamicContext() : dynamicContext;
+    ISequence<?> focusSeqence = function.isFocusDepenent()
+        ? ObjectUtils.requireNonNull(focus, "Function call requires a focus")
+        : ISequence.empty();
+    return (ISequence<R>) function.execute(
+        arguments == null ? CollectionUtil.emptyList() : arguments,
+        context,
+        focusSeqence);
   }
 }
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContainsTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContainsTest.java
new file mode 100644
index 000000000..e32735fdc
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapContainsTest.java
@@ -0,0 +1,74 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.bool;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.LookupTest;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class MapContainsTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            bool(true),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN + " return map:contains($week, 2)"),
+        Arguments.of(
+            bool(false),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN + " return map:contains($week, 9)"),
+        Arguments.of(
+            bool(false),
+            "map:contains(map{}, \"xyz\")"),
+        Arguments.of(
+            bool(true),
+            "map:contains(map{\"xyz\":23}, \"xyz\")"),
+        Arguments.of(
+            bool(true),
+            "map:contains(map{\"abc\":23, \"xyz\":()}, \"xyz\")"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IItem expected, @NonNull String metapath) {
+
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntryTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntryTest.java
new file mode 100644
index 000000000..46c2dff1d
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapEntryTest.java
@@ -0,0 +1,65 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class MapEntryTest
+    extends ExpressionTestBase {
+
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            map(entry(string("M"), string("Monday"))),
+            "map:entry(\"M\", \"Monday\")"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IMapItem<?> expected, @NonNull String metapath) {
+
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFindTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFindTest.java
new file mode 100644
index 000000000..24df92682
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapFindTest.java
@@ -0,0 +1,80 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class MapFindTest
+    extends ExpressionTestBase {
+  private static final String RESPONSES = "[map{0:'no', 1:'yes'}, map{0:'non', 1:'oui'},"
+      + " map{0:'nein', 1:('ja', 'doch')}]";
+  private static final String INVENTORY = "map{\"name\":\"car\", \"id\":\"QZ123\","
+      + " \"parts\": [map{\"name\":\"engine\", \"id\":\"YW678\", \"parts\":[]}]}";
+
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            array(string("no"), string("non"), string("nein")),
+            "let $responses :=  " + RESPONSES + " return map:find($responses, 0)"),
+        Arguments.of(
+            array(string("yes"), string("oui"), sequence(string("ja"), string("doch"))),
+            "let $responses :=  " + RESPONSES + " return map:find($responses, 1)"),
+        Arguments.of(
+            array(),
+            "let $responses :=  " + RESPONSES + " return map:find($responses, 2)"),
+        Arguments.of(
+            array(array(map(entry(string("name"), string("engine")), entry(string("id"), string("YW678")),
+                entry(string("parts"), array()))), array()),
+            "let $inventory :=  " + INVENTORY + " return map:find($inventory, \"parts\")"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IItem expected, @NonNull String metapath) {
+
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGetTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGetTest.java
new file mode 100644
index 000000000..be8a46f3d
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapGetTest.java
@@ -0,0 +1,70 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.function.LookupTest;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class MapGetTest
+    extends ExpressionTestBase {
+
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            sequence(string("Donnerstag")),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN + " return map:get($week, 4)"),
+        Arguments.of(
+            sequence(),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN + " return map:get($week, 9)"),
+        Arguments.of(
+            sequence(),
+            "map:get(map:entry(7,()), 7)"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull ISequence<?> expected, @NonNull String metapath) {
+
+    ISequence<?> result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.SEQUENCE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingContainerModelGrouped.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeysTest.java
similarity index 62%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingContainerModelGrouped.java
rename to core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeysTest.java
index 1c94fdfd5..b42ef8e40 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingContainerModelGrouped.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapKeysTest.java
@@ -24,37 +24,34 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema;
+package gov.nist.secauto.metaschema.core.metapath.function.library;
 
-import gov.nist.secauto.metaschema.core.model.IContainerModelGrouped;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.Collection;
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
 
-public interface IBindingContainerModelGrouped extends IContainerModelGrouped {
+import org.junit.jupiter.api.Test;
 
-  @Override
-  IBindingDefinitionAssembly getOwningDefinition();
+import java.util.HashSet;
+import java.util.Set;
 
-  @Override
-  default Collection<? extends IBindingInstanceModelNamedGrouped> getModelInstances() {
-    return getNamedModelInstances();
-  }
-
-  @Override
-  Collection<? extends IBindingInstanceModelNamedGrouped> getNamedModelInstances();
-
-  @Override
-  IBindingInstanceModelNamedGrouped getNamedModelInstanceByName(String name);
+class MapKeysTest
+    extends ExpressionTestBase {
 
-  @Override
-  Collection<? extends IBindingInstanceModelFieldGrouped> getFieldInstances();
+  @Test
+  void test() {
+    ISequence<IAnyAtomicItem> result = MetapathExpression.compile("map:keys(map{1:\"yes\", 2:\"no\"})")
+        .evaluateAs(null, MetapathExpression.ResultType.SEQUENCE);
+    assert result != null;
 
-  @Override
-  IBindingInstanceModelFieldGrouped getFieldInstanceByName(String name);
+    // use a set to allow any ordering of the keys, since we have no control over
+    // their order
+    Set<IAnyAtomicItem> keys = new HashSet<>(result);
 
-  @Override
-  Collection<? extends IBindingInstanceModelAssemblyGrouped> getAssemblyInstances();
-
-  @Override
-  IBindingInstanceModelAssemblyGrouped getAssemblyInstanceByName(String name);
+    assertEquals(Set.of(integer(1), integer(2)), keys);
+  }
 }
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMergeTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMergeTest.java
new file mode 100644
index 000000000..e4c2101e7
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapMergeTest.java
@@ -0,0 +1,113 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.LookupTest;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class MapMergeTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            map(),
+            "map:merge(())"),
+        Arguments.of(
+            map(entry(integer(0), string("no")), entry(integer(1), string("yes"))),
+            "map:merge((map:entry(0, \"no\"), map:entry(1, \"yes\")))"),
+        Arguments.of(
+            map(
+                entry(integer(0), string("Sonntag")),
+                entry(integer(1), string("Montag")),
+                entry(integer(2), string("Dienstag")),
+                entry(integer(3), string("Mittwoch")),
+                entry(integer(4), string("Donnerstag")),
+                entry(integer(5), string("Freitag")),
+                entry(integer(6), string("Samstag")),
+                entry(integer(7), string("Unbekannt"))),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN + " return map:merge(($week, map{7:\"Unbekannt\"}))"),
+        Arguments.of(
+            map(
+                entry(integer(0), string("Sonntag")),
+                entry(integer(1), string("Montag")),
+                entry(integer(2), string("Dienstag")),
+                entry(integer(3), string("Mittwoch")),
+                entry(integer(4), string("Donnerstag")),
+                entry(integer(5), string("Freitag")),
+                entry(integer(6), string("Sonnabend"))),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN
+                + " return map:merge(($week, map{6:\"Sonnabend\"}), map{\"duplicates\":\"use-last\"})"),
+        Arguments.of(
+            map(
+                entry(integer(0), string("Sonntag")),
+                entry(integer(1), string("Montag")),
+                entry(integer(2), string("Dienstag")),
+                entry(integer(3), string("Mittwoch")),
+                entry(integer(4), string("Donnerstag")),
+                entry(integer(5), string("Freitag")),
+                entry(integer(6), string("Samstag"))),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN
+                + " return map:merge(($week, map{6:\"Sonnabend\"}), map{\"duplicates\":\"use-first\"})"),
+        Arguments.of(
+            map(
+                entry(integer(0), string("Sonntag")),
+                entry(integer(1), string("Montag")),
+                entry(integer(2), string("Dienstag")),
+                entry(integer(3), string("Mittwoch")),
+                entry(integer(4), string("Donnerstag")),
+                entry(integer(5), string("Freitag")),
+                entry(integer(6), sequence(string("Samstag"), string("Sonnabend")))),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN
+                + " return map:merge(($week, map{6:\"Sonnabend\"}), map{\"duplicates\":\"combine\"})"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IItem expected, @NonNull String metapath) {
+
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPutTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPutTest.java
new file mode 100644
index 000000000..345b48e3f
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapPutTest.java
@@ -0,0 +1,85 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.LookupTest;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class MapPutTest
+    extends ExpressionTestBase {
+
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            map(
+                entry(integer(0), string("Sonntag")),
+                entry(integer(1), string("Montag")),
+                entry(integer(2), string("Dienstag")),
+                entry(integer(3), string("Mittwoch")),
+                entry(integer(4), string("Donnerstag")),
+                entry(integer(5), string("Freitag")),
+                entry(integer(6), string("Sonnabend"))),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN + " return map:put($week, 6, \"Sonnabend\") "),
+        Arguments.of(
+            map(
+                entry(integer(0), string("Sonntag")),
+                entry(integer(1), string("Montag")),
+                entry(integer(2), string("Dienstag")),
+                entry(integer(3), string("Mittwoch")),
+                entry(integer(4), string("Donnerstag")),
+                entry(integer(5), string("Freitag")),
+                entry(integer(6), string("Samstag")),
+                entry(integer(-1), string("Unbekannt"))),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN + " return map:put($week, -1, \"Unbekannt\")"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IMapItem<?> expected, @NonNull String metapath) {
+
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemoveTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemoveTest.java
new file mode 100644
index 000000000..d2955151e
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapRemoveTest.java
@@ -0,0 +1,101 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.LookupTest;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class MapRemoveTest
+    extends ExpressionTestBase {
+
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            map(
+                entry(integer(0), string("Sonntag")),
+                entry(integer(1), string("Montag")),
+                entry(integer(2), string("Dienstag")),
+                entry(integer(3), string("Mittwoch")),
+                entry(integer(5), string("Freitag")),
+                entry(integer(6), string("Samstag"))),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN + " return map:remove($week, 4)"),
+        Arguments.of(
+            map(
+                entry(integer(0), string("Sonntag")),
+                entry(integer(1), string("Montag")),
+                entry(integer(2), string("Dienstag")),
+                entry(integer(3), string("Mittwoch")),
+                entry(integer(4), string("Donnerstag")),
+                entry(integer(5), string("Freitag")),
+                entry(integer(6), string("Samstag"))),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN + " return map:remove($week, 23)"),
+        Arguments.of(
+            map(
+                entry(integer(1), string("Montag")),
+                entry(integer(2), string("Dienstag")),
+                entry(integer(3), string("Mittwoch")),
+                entry(integer(4), string("Donnerstag")),
+                entry(integer(5), string("Freitag"))),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN + " return map:remove($week, (0, 6 to 7))"),
+        Arguments.of(
+            map(
+                entry(integer(0), string("Sonntag")),
+                entry(integer(1), string("Montag")),
+                entry(integer(2), string("Dienstag")),
+                entry(integer(3), string("Mittwoch")),
+                entry(integer(4), string("Donnerstag")),
+                entry(integer(5), string("Freitag")),
+                entry(integer(6), string("Samstag"))),
+            "let $week :=  " + LookupTest.WEEKDAYS_GERMAN + " return map:remove($week, ())"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IMapItem<?> expected, @NonNull String metapath) {
+
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSizeTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSizeTest.java
new file mode 100644
index 000000000..fa337fbe6
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/function/library/MapSizeTest.java
@@ -0,0 +1,65 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.function.library;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.item.IItem;
+import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class MapSizeTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> provideValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            integer(0),
+            "map:size(map{})"),
+        Arguments.of(
+            integer(2),
+            "map:size(map{\"true\":1, \"false\":0})"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideValues")
+  void testExpression(@NonNull IIntegerItem expected, @NonNull String metapath) {
+
+    IItem result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItemTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItemTest.java
new file mode 100644
index 000000000..7aa6d9be3
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/IArrayItemTest.java
@@ -0,0 +1,88 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.item.function;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+class IArrayItemTest
+    extends ExpressionTestBase {
+  private static Stream<Arguments> squareConstructorValues() { // NOPMD - false positive
+    return Stream.of(
+        Arguments.of(
+            array(integer(1), integer(2), integer(5), integer(7)),
+            "[ 1, 2, 5, 7 ]"),
+        Arguments.of(
+            array(sequence(), sequence(integer(27), integer(17), integer(0))),
+            "[ (), (27, 17, 0)]"),
+        Arguments.of(
+            array(sequence(string("a"), string("b")), sequence(string("c"), string("d"))),
+            "[(\"a\", \"b\"), (\"c\", \"d\")]"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("squareConstructorValues")
+  void testSquareConstructor(@NonNull IArrayItem<?> expected, @NonNull String metapath) {
+    IArrayItem<?> result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+
+  private static Stream<Arguments> curlyConstructorValues() { // NOPMD - false positive
+    return Stream.of(
+        // curly constructor
+        Arguments.of(
+            array(integer(1), integer(2), integer(5), integer(7)),
+            "array { 1, 2, 5, 7 }"),
+        Arguments.of(
+            array(integer(27), integer(17), integer(0)),
+            "array { (), (27, 17, 0) }"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("curlyConstructorValues")
+  void testCurlyConstructor(@NonNull IArrayItem<?> expected, @NonNull String metapath) {
+    IArrayItem<?> result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.NODE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/LookupTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/LookupTest.java
new file mode 100644
index 000000000..bdff1d6a4
--- /dev/null
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/function/LookupTest.java
@@ -0,0 +1,183 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.core.metapath.item.function;
+
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.array;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.entry;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.map;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.sequence;
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.string;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import gov.nist.secauto.metaschema.core.metapath.ExpressionTestBase;
+import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class LookupTest
+    extends ExpressionTestBase {
+
+  public static final String WEEKDAYS = "map { \"Su\" : \"Sunday\",\"Mo\" : \"Monday\", \"Tu\" : \"Tuesday\","
+      + " \"We\" : \"Wednesday\", \"Th\" : \"Thursday\", \"Fr\" : \"Friday\", \"Sa\" : \"Saturday\"}";
+  public static final String WEEKDAYS_GERMAN = "map{0:\"Sonntag\", 1:\"Montag\", 2:\"Dienstag\", 3:\"Mittwoch\","
+      + " 4:\"Donnerstag\", 5:\"Freitag\", 6:\"Samstag\"}";
+  private static final String BOOKS = "map {" +
+      "\"book\": map {" +
+      "    \"title\": \"Data on the Web\"," +
+      "    \"year\": 2000," +
+      "    \"author\": [" +
+      "        map {" +
+      "            \"last\": \"Abiteboul\"," +
+      "            \"first\": \"Serge\"" +
+      "        }," +
+      "        map {" +
+      "            \"last\": \"Buneman\"," +
+      "            \"first\": \"Peter\"" +
+      "        }," +
+      "        map {" +
+      "            \"last\": \"Suciu\"," +
+      "            \"first\": \"Dan\"" +
+      "        }" +
+      "    ]," +
+      "    \"publisher\": \"Morgan Kaufmann Publishers\"," +
+      "    \"price\": 39.95" +
+      "}" +
+      "}";
+
+  private static Stream<Arguments> functionCallLookupValues() { // NOPMD - false positive
+    return Stream.of(
+        // function call lookup
+        Arguments.of(
+            sequence(integer(7)),
+            "[ 1, 2, 5, 7 ](4)"),
+        Arguments.of(
+            sequence(array(integer(4), integer(5), integer(6))),
+            "[ [1, 2, 3], [4, 5, 6]](2)"),
+        Arguments.of(
+            sequence(integer(5)),
+            "[ [1, 2, 3], [4, 5, 6]](2)(2)"),
+        Arguments.of(
+            sequence(string("Robert Johnson")),
+            "[ 'a', 123, \"Robert Johnson\" ](3)"),
+        Arguments.of(
+            sequence(integer(27)),
+            "array { (), (27, 17, 0) }(1)"),
+        Arguments.of(
+            sequence(integer(7)),
+            "[ 1, 2, 5, 7 ](4)"),
+        Arguments.of(
+            sequence(string("Donnerstag")),
+            "let $week :=  " + WEEKDAYS_GERMAN + " return $week(4)"),
+        Arguments.of(
+            sequence(string("Sunday")),
+            "let $weekdays := " + WEEKDAYS + " return $weekdays(\"Su\")"),
+        Arguments.of(
+            sequence(string("Data on the Web")),
+            "let $b := " + BOOKS + " return $b(\"book\")(\"title\")"),
+        Arguments.of(
+            sequence(array(
+                map(
+                    entry(string("last"), string("Abiteboul")),
+                    entry(string("first"), string("Serge"))),
+                map(
+                    entry(string("last"), string("Buneman")),
+                    entry(string("first"), string("Peter"))),
+                map(
+                    entry(string("last"), string("Suciu")),
+                    entry(string("first"), string("Dan"))))),
+            "let $b := " + BOOKS + " return $b(\"book\")(\"author\")"),
+        Arguments.of(
+            sequence(string("Abiteboul")),
+            "let $b := " + BOOKS + " return $b(\"book\")(\"author\")(1)(\"last\")"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("functionCallLookupValues")
+  void testFunctionCallLookup(@NonNull ISequence<?> expected, @NonNull String metapath) {
+    ISequence<?> result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.SEQUENCE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+
+  private static Stream<Arguments> postfixLookupValues() { // NOPMD - false positive
+    return Stream.of(
+        // postfix lookup
+        Arguments.of(
+            sequence(string("Jenna")),
+            "map { \"first\" : \"Jenna\", \"last\" : \"Scott\" }?first"),
+        Arguments.of(
+            sequence(integer(5)),
+            "[4, 5, 6]?2"),
+        Arguments.of(
+            sequence(string("Tom"), string("Dick"), string("Harry")),
+            "(map {\"first\": \"Tom\"}, map {\"first\": \"Dick\"}, map {\"first\":\"Harry\"})?first"),
+        Arguments.of(
+            sequence(string("Donnerstag")),
+            "let $week :=  " + WEEKDAYS_GERMAN + " return $week?4"),
+        Arguments.of(
+            sequence(integer(2), integer(5)),
+            "([1,2,3], [4,5,6])?2"),
+        Arguments.of(
+            sequence(integer(1), integer(2), integer(5), integer(7)),
+            "[1, 2, 5, 7]?*"),
+        Arguments.of(
+            sequence(array(integer(1), integer(2), integer(3)), array(integer(4), integer(5), integer(6))),
+            "[[1, 2, 3], [4, 5, 6]]?*"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("postfixLookupValues")
+  void testPostfixLookup(@NonNull ISequence<?> expected, @NonNull String metapath) {
+    ISequence<?> result = MetapathExpression.compile(metapath)
+        .evaluateAs(null, MetapathExpression.ResultType.SEQUENCE, newDynamicContext());
+    assertEquals(expected, result);
+  }
+
+  @Test
+  void testUnaryLookupMissingMember() {
+    ArrayException thrown = assertThrows(
+        ArrayException.class,
+        () -> {
+          ISequence<?> result = MetapathExpression.compile("([1,2,3], [1,2,5], [1,2])[?3 = 5]")
+              .evaluateAs(null, MetapathExpression.ResultType.SEQUENCE, newDynamicContext());
+          assertNotNull(result);
+          result.safeStream();
+        });
+    assertEquals(ArrayException.INDEX_OUT_OF_BOUNDS, thrown.getCode());
+  }
+}
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java
index 2e1206b16..e2347a2d7 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java
@@ -10,33 +10,44 @@
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IFieldInstance;
 import gov.nist.secauto.metaschema.core.testing.MockedModelTestSupport;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import org.hamcrest.FeatureMatcher;
 import org.hamcrest.Matcher;
 import org.jmock.Expectations;
 import org.junit.jupiter.api.Test;
 
+import java.net.URI;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 class DefaultNodeItemFactoryTest
     extends MockedModelTestSupport {
+  @NonNull
+  private static final URI NS_URI = ObjectUtils.notNull(URI.create("http://example.com/ns"));
+  @NonNull
+  private static final String NS = ObjectUtils.notNull(NS_URI.toASCIIString());
+
   @Test
   void testGenerateFlags() {
     DefaultNodeItemFactory nodeFactory = DefaultNodeItemFactory.instance();
 
     IAssemblyDefinition parent = assembly()
+        .namespace(NS_URI)
         .name("assembly1")
         .toDefinition();
 
     IFieldInstance fieldInstance = field()
+        .namespace(NS_URI)
         .name("field1")
         .flags(List.of(
-            flag().name("flag1")))
+            flag().namespace(NS_URI).name("flag1")))
         .toInstance(parent);
 
     Object fieldValue = "test value";
@@ -44,7 +55,7 @@ void testGenerateFlags() {
     // setup the value calls
     getContext().checking(new Expectations() {
       { // NOPMD - intentional
-        allowing(fieldInstance.getDefinition().getFlagInstanceByName("flag1")).getValue(fieldValue);
+        allowing(fieldInstance.getDefinition().getFlagInstanceByName(new QName(NS, "flag1"))).getValue(fieldValue);
         will(returnValue("flag1 value"));
       }
     });
@@ -55,18 +66,19 @@ void testGenerateFlags() {
     Collection<? extends IFlagNodeItem> flagItems = field.getFlags();
     assertThat(flagItems, containsInAnyOrder(
         allOf(
-            match("name", flag -> flag.getName(), equalTo("flag1")),
+            match("name", flag -> flag.getName(), equalTo(new QName(NS, "flag1"))),
             match("value", flag -> flag.getValue(), equalTo("flag1 value"))))); // NOPMD
   }
 
   @Test
   void testGenerateModelItems() {
     IAssemblyDefinition assembly = assembly()
+        .namespace(NS_URI)
         .name("assembly1")
         .flags(List.of(
-            flag().name("flag1")))
+            flag().namespace(NS_URI).name("flag1")))
         .modelInstances(List.of(
-            field().name("field1")))
+            field().namespace(NS_URI).name("field1")))
         .toDefinition();
 
     Object assemblyValue = "assembly value";
@@ -76,11 +88,11 @@ void testGenerateModelItems() {
     // Setup the value calls
     getContext().checking(new Expectations() {
       { // NOPMD - intentional
-        allowing(assembly.getFlagInstanceByName("flag1")).getValue(assemblyValue);
+        allowing(assembly.getFlagInstanceByName(new QName(NS, "flag1"))).getValue(assemblyValue);
         will(returnValue(flagValue));
-        allowing(assembly.getNamedModelInstanceByName("field1")).getValue(assemblyValue);
+        allowing(assembly.getNamedModelInstanceByName(new QName(NS, "field1"))).getValue(assemblyValue);
         will(returnValue(fieldValue));
-        allowing(assembly.getNamedModelInstanceByName("field1")).getItemValues(fieldValue);
+        allowing(assembly.getNamedModelInstanceByName(new QName(NS, "field1"))).getItemValues(fieldValue);
         will(returnValue(List.of(fieldValue)));
       }
     });
@@ -93,11 +105,11 @@ void testGenerateModelItems() {
     assertAll(
         () -> assertThat(flagItems, containsInAnyOrder(
             allOf(
-                match("name", flag -> flag.getName(), equalTo("flag1")),
+                match("name", flag -> flag.getName(), equalTo(new QName(NS, "flag1"))),
                 match("value", flag -> flag.getValue(), equalTo("flag1 value"))))),
         () -> assertThat(modelItems, containsInAnyOrder(
             allOf(
-                match("name", model -> model.getName(), equalTo("field1")),
+                match("name", model -> model.getName(), equalTo(new QName(NS, "field1"))),
                 match("value", model -> model.getValue(), equalTo("field1 value"))))));
   }
 
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/MockNodeItemFactory.java b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/MockNodeItemFactory.java
index eeec8108b..c4edc7df1 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/MockNodeItemFactory.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/metapath/item/node/MockNodeItemFactory.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import org.hamcrest.Description;
 import org.jmock.Expectations;
@@ -44,10 +45,13 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 // TODO: Integrate with classes in gov.nist.secauto.metaschema.core.testing
+@SuppressWarnings("checkstyle:MissingJavadocMethodCheck")
 @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT")
 public class MockNodeItemFactory {
 
@@ -76,11 +80,12 @@ protected <T extends INodeItem> T newMock(@NonNull Class<T> clazz, @NonNull Stri
     return getContext().mock(clazz, mockName);
   }
 
-  public IDocumentNodeItem document(@NonNull URI documentURI, @NonNull String name,
+  public IDocumentNodeItem document(@NonNull URI documentURI, @NonNull QName rootName,
       @NonNull List<IFlagNodeItem> flags,
       @NonNull List<IModelNodeItem<?, ?>> modelItems) {
-    IDocumentNodeItem document = newMock(IDocumentNodeItem.class, name);
-    IRootAssemblyNodeItem root = newMock(IRootAssemblyNodeItem.class, name);
+    String qname = ObjectUtils.notNull(rootName.toString());
+    IDocumentNodeItem document = newMock(IDocumentNodeItem.class, qname);
+    IRootAssemblyNodeItem root = newMock(IRootAssemblyNodeItem.class, qname);
 
     getContext().checking(new Expectations() {
       { // NOPMD - intentional
@@ -96,7 +101,7 @@ public IDocumentNodeItem document(@NonNull URI documentURI, @NonNull String name
         will(returnValue(Stream.of(document)));
 
         allowing(root).getName();
-        will(returnValue(name));
+        will(returnValue(rootName));
         allowing(root).getNodeItem();
         will(returnValue(root));
         allowing(root).getDocumentNodeItem();
@@ -128,7 +133,7 @@ protected <T extends INodeItem> void handleChildren(
           will(returnValue(item));
         });
 
-        Map<String, List<IModelNodeItem<?, ?>>> modelItemsMap = toModelItemsMap(modelItems);
+        Map<QName, List<IModelNodeItem<?, ?>>> modelItemsMap = toModelItemsMap(modelItems);
         allowing(item).getModelItems();
         will(returnValue(modelItemsMap.values()));
         modelItemsMap.entrySet().forEach(entry -> {
@@ -168,12 +173,12 @@ public Object invoke(Invocation invocation) {
 
   @SuppressWarnings("static-method")
   @NonNull
-  private Map<String, List<IModelNodeItem<?, ?>>>
+  private Map<QName, List<IModelNodeItem<?, ?>>>
       toModelItemsMap(@NonNull List<IModelNodeItem<?, ?>> modelItems) {
 
-    Map<String, List<IModelNodeItem<?, ?>>> retval = new LinkedHashMap<>(); // NOPMD - intentional
+    Map<QName, List<IModelNodeItem<?, ?>>> retval = new LinkedHashMap<>(); // NOPMD - intentional
     for (IModelNodeItem<?, ?> item : modelItems) {
-      String name = item.getName();
+      QName name = item.getName();
       List<IModelNodeItem<?, ?>> namedItems = retval.get(name);
       if (namedItems == null) {
         namedItems = new LinkedList<>(); // NOPMD - intentional
@@ -185,8 +190,8 @@ public Object invoke(Invocation invocation) {
   }
 
   @NonNull
-  public IFlagNodeItem flag(@NonNull String name, @NonNull IAnyAtomicItem value) {
-    IFlagNodeItem retval = newMock(IFlagNodeItem.class, name);
+  public IFlagNodeItem flag(@NonNull QName name, @NonNull IAnyAtomicItem value) {
+    IFlagNodeItem retval = newMock(IFlagNodeItem.class, ObjectUtils.notNull(name.toString()));
 
     getContext().checking(new Expectations() {
       { // NOPMD - intentional
@@ -210,14 +215,16 @@ public IFlagNodeItem flag(@NonNull String name, @NonNull IAnyAtomicItem value) {
   }
 
   @NonNull
-  public IFieldNodeItem field(@NonNull String name, @NonNull IAnyAtomicItem value) {
+  public IFieldNodeItem field(@NonNull QName name, @NonNull IAnyAtomicItem value) {
     return field(name, value, CollectionUtil.emptyList());
   }
 
   @NonNull
-  public IFieldNodeItem field(@NonNull String name, @NonNull IAnyAtomicItem value,
+  public IFieldNodeItem field(
+      @NonNull QName name,
+      @NonNull IAnyAtomicItem value,
       @NonNull List<IFlagNodeItem> flags) {
-    IFieldNodeItem retval = newMock(IFieldNodeItem.class, name);
+    IFieldNodeItem retval = newMock(IFieldNodeItem.class, ObjectUtils.notNull(name.toString()));
 
     getContext().checking(new Expectations() {
       { // NOPMD - intentional
@@ -240,9 +247,11 @@ public IFieldNodeItem field(@NonNull String name, @NonNull IAnyAtomicItem value,
   }
 
   @NonNull
-  public IAssemblyNodeItem assembly(@NonNull String name, @NonNull List<IFlagNodeItem> flags,
+  public IAssemblyNodeItem assembly(
+      @NonNull QName name,
+      @NonNull List<IFlagNodeItem> flags,
       @NonNull List<IModelNodeItem<?, ?>> modelItems) {
-    IAssemblyNodeItem retval = newMock(IAssemblyNodeItem.class, name);
+    IAssemblyNodeItem retval = newMock(IAssemblyNodeItem.class, ObjectUtils.notNull(name.toString()));
 
     getContext().checking(new Expectations() {
       { // NOPMD - intentional
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java
index deeaae5b1..2b3b6b636 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java
@@ -37,7 +37,6 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
-import gov.nist.secauto.metaschema.core.metapath.StaticContext;
 import gov.nist.secauto.metaschema.core.metapath.format.IPathFormatter;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem;
@@ -53,32 +52,41 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import java.net.URI;
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 @SuppressWarnings("PMD.TooManyStaticImports")
 class DefaultConstraintValidatorTest {
+  private static final String NS = URI.create("http://example.com/ns").toASCIIString();
+
   @RegisterExtension
   Mockery context = new JUnit5Mockery();
 
+  @NonNull
+  private static QName qname(@NonNull String name) {
+    return new QName(NS, name);
+  }
+
   @SuppressWarnings("null")
   @Test
   void testAllowedValuesAllowOther() {
     MockNodeItemFactory itemFactory = new MockNodeItemFactory(context);
 
-    IFlagNodeItem flag = itemFactory.flag("value", IStringItem.valueOf("value"));
+    IFlagNodeItem flag = itemFactory.flag(qname("value"), IStringItem.valueOf("value"));
 
     IFlagDefinition flagDefinition = context.mock(IFlagDefinition.class);
 
     IAllowedValuesConstraint allowedValues = IAllowedValuesConstraint.builder()
         .source(ISource.modelSource())
         .allowedValue(IAllowedValue.of("other", MarkupLine.fromMarkdown("some documentation")))
-        .allowedOther(true)
+        .allowsOther(true)
         .build();
 
-    DynamicContext dynamicContext = StaticContext.builder()
-        .build().dynamicContext();
+    DynamicContext dynamicContext = new DynamicContext();
 
     context.checking(new Expectations() {
       { // NOPMD - intentional
@@ -114,26 +122,25 @@ void testAllowedValuesAllowOther() {
   void testAllowedValuesMultipleAllowOther() {
     MockNodeItemFactory itemFactory = new MockNodeItemFactory(context);
 
-    IFlagNodeItem flag = itemFactory.flag("value", IStringItem.valueOf("value"));
+    IFlagNodeItem flag = itemFactory.flag(qname("value"), IStringItem.valueOf("value"));
 
     IFlagDefinition flagDefinition = context.mock(IFlagDefinition.class);
 
     IAllowedValuesConstraint allowedValues1 = IAllowedValuesConstraint.builder()
         .source(ISource.modelSource())
         .allowedValue(IAllowedValue.of("other", MarkupLine.fromMarkdown("some documentation")))
-        .allowedOther(true)
+        .allowsOther(true)
         .build();
     IAllowedValuesConstraint allowedValues2 = IAllowedValuesConstraint.builder()
         .source(ISource.modelSource())
         .allowedValue(IAllowedValue.of("other2", MarkupLine.fromMarkdown("some documentation")))
-        .allowedOther(true)
+        .allowsOther(true)
         .build();
 
     List<? extends IAllowedValuesConstraint> allowedValuesConstraints
         = List.of(allowedValues1, allowedValues2);
 
-    DynamicContext dynamicContext = StaticContext.builder()
-        .build().dynamicContext();
+    DynamicContext dynamicContext = new DynamicContext();
 
     context.checking(new Expectations() {
       { // NOPMD - intentional
@@ -169,27 +176,26 @@ void testAllowedValuesMultipleAllowOther() {
   void testMultipleAllowedValuesConflictingAllowOther() {
     MockNodeItemFactory itemFactory = new MockNodeItemFactory(context);
 
-    IFlagNodeItem flag1 = itemFactory.flag("value", IStringItem.valueOf("value"));
-    IFlagNodeItem flag2 = itemFactory.flag("other2", IStringItem.valueOf("other2"));
+    IFlagNodeItem flag1 = itemFactory.flag(qname("value"), IStringItem.valueOf("value"));
+    IFlagNodeItem flag2 = itemFactory.flag(qname("other2"), IStringItem.valueOf("other2"));
 
     IFlagDefinition flagDefinition = context.mock(IFlagDefinition.class);
 
     IAllowedValuesConstraint allowedValues1 = IAllowedValuesConstraint.builder()
         .source(ISource.modelSource())
         .allowedValue(IAllowedValue.of("other", MarkupLine.fromMarkdown("some documentation")))
-        .allowedOther(true)
+        .allowsOther(true)
         .build();
     IAllowedValuesConstraint allowedValues2 = IAllowedValuesConstraint.builder()
         .source(ISource.modelSource())
         .allowedValue(IAllowedValue.of("other2", MarkupLine.fromMarkdown("some documentation")))
-        .allowedOther(false)
+        .allowsOther(false)
         .build();
 
     List<? extends IAllowedValuesConstraint> allowedValuesConstraints
         = List.of(allowedValues1, allowedValues2);
 
-    DynamicContext dynamicContext = StaticContext.builder()
-        .build().dynamicContext();
+    DynamicContext dynamicContext = new DynamicContext();
 
     context.checking(new Expectations() {
       { // NOPMD - intentional
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/ExamplesTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/ExamplesTest.java
index 447aa30ad..dad9cc9dc 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/ExamplesTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/ExamplesTest.java
@@ -29,6 +29,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -37,6 +38,8 @@
 import java.io.IOException;
 import java.net.URI;
 
+import javax.xml.namespace.QName;
+
 class ExamplesTest {
 
   @Test
@@ -46,7 +49,7 @@ void testLoadMetaschema() throws MetaschemaException, IOException {
 
     URI moduleUri = ObjectUtils.notNull(URI.create(
         "https://raw.githubusercontent.com/usnistgov/OSCAL/v1.0.0/src/metaschema/oscal_complete_metaschema.xml"));
-    IXmlModule module = loader.load(moduleUri);
+    IMetaschemaModule module = loader.load(moduleUri);
     assertNotNull(module, "metaschema not found");
   }
 
@@ -56,9 +59,10 @@ void testExamineAssemblyDefinitionByName() throws MetaschemaException, IOExcepti
     loader.allowEntityResolution();
     URI moduleUri = ObjectUtils.notNull(URI.create(
         "https://raw.githubusercontent.com/usnistgov/OSCAL/v1.0.0/src/metaschema/oscal_complete_metaschema.xml"));
-    IXmlModule module = loader.load(moduleUri);
+    IMetaschemaModule module = loader.load(moduleUri);
 
-    IAssemblyDefinition definition = module.getScopedAssemblyDefinitionByName("property");
+    IAssemblyDefinition definition = module.getScopedAssemblyDefinitionByName(
+        new QName("http://csrc.nist.gov/ns/oscal/1.0", "property"));
     assertNotNull(definition, "definition not found");
   }
 
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/MetaConstraintLoaderTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/MetaConstraintLoaderTest.java
index 0a2a24063..e73d9bb35 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/MetaConstraintLoaderTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/MetaConstraintLoaderTest.java
@@ -30,11 +30,13 @@
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
+import gov.nist.secauto.metaschema.core.metapath.StaticContext;
 import gov.nist.secauto.metaschema.core.metapath.function.library.FnPath;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
@@ -59,9 +61,13 @@ void test() throws MetaschemaException, IOException {
     ModuleLoader loader = new ModuleLoader(CollectionUtil.singletonList(postProcessor));
     URI moduleUri = ObjectUtils.notNull(
         Paths.get("metaschema/examples/computer-example.xml").toUri());
-    IXmlModule module = loader.load(moduleUri);
+    IMetaschemaModule module = loader.load(moduleUri);
 
-    MetapathExpression expression = MetapathExpression.compile("//@id");
+    StaticContext staticContext = StaticContext.builder()
+        .defaultModelNamespace(module.getXmlNamespace())
+        .build();
+
+    MetapathExpression expression = MetapathExpression.compile("//@id", staticContext);
     IModuleNodeItem moduleItem = INodeItemFactory.instance().newModuleNodeItem(module);
     for (IItem item : expression.evaluate(moduleItem)) {
       IDefinitionNodeItem<?, ?> nodeItem = (IDefinitionNodeItem<?, ?>) item;
@@ -72,7 +78,7 @@ void test() throws MetaschemaException, IOException {
           .count()));
     }
 
-    expression.evaluate(moduleItem).asStream()
+    expression.evaluate(moduleItem).stream()
         .map(item -> (IDefinitionNodeItem<?, ?>) item)
         .forEach(item -> assertEquals(1, item.getDefinition().getMatchesConstraints().stream()
             .filter(matches -> MetaschemaDataTypeProvider.UUID.equals(matches.getDataType()))
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/MetaschemaModuleTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/MetaschemaModuleTest.java
index cb2635089..0eb130b3b 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/MetaschemaModuleTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/MetaschemaModuleTest.java
@@ -28,6 +28,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -44,7 +45,7 @@ void testFile() throws MetaschemaException, IOException {
     ModuleLoader loader = new ModuleLoader();
     URI moduleUri = ObjectUtils.notNull(
         Paths.get("metaschema/schema/metaschema/metaschema-module-metaschema.xml").toUri());
-    IXmlModule module = loader.load(moduleUri);
+    IMetaschemaModule module = loader.load(moduleUri);
     assertFalse(module.getExportedRootAssemblyDefinitions().isEmpty(), "no roots found");
   }
 }
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/ModuleLoaderTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/ModuleLoaderTest.java
index b39071c2c..0c1ea4c65 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/ModuleLoaderTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/ModuleLoaderTest.java
@@ -34,6 +34,7 @@
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IConstraintLoader;
 import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
@@ -48,6 +49,8 @@
 import java.nio.file.Paths;
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 class ModuleLoaderTest {
 
   @Test
@@ -56,13 +59,14 @@ void testUrl() throws MetaschemaException, IOException { // NOPMD - intentional
     loader.allowEntityResolution();
     URI moduleUri = ObjectUtils.notNull(URI.create(
         "https://raw.githubusercontent.com/usnistgov/OSCAL/v1.0.0/src/metaschema/oscal_complete_metaschema.xml"));
-    IXmlModule module = loader.load(moduleUri);
+    IMetaschemaModule module = loader.load(moduleUri);
 
-    IXmlModule oscalCatalogModule = module.getImportedModuleByShortName("oscal-catalog");
+    IMetaschemaModule oscalCatalogModule = module.getImportedModuleByShortName("oscal-catalog");
     assertNotNull(oscalCatalogModule, "catalog metaschema not found");
-    IXmlModule metadataModule = oscalCatalogModule.getImportedModuleByShortName("oscal-metadata");
+    IMetaschemaModule metadataModule = oscalCatalogModule.getImportedModuleByShortName("oscal-metadata");
     assertNotNull(metadataModule, "metadata metaschema not found");
-    IFlagDefinition flag = metadataModule.getScopedFlagDefinitionByName("location-type");
+    IFlagDefinition flag
+        = metadataModule.getScopedFlagDefinitionByName(new QName("location-type"));
     assertNotNull(flag, "flag not found");
     List<? extends IConstraint> constraints = flag.getConstraints();
     assertFalse(constraints.isEmpty(), "a constraint was expected");
@@ -73,7 +77,7 @@ void testFile() throws MetaschemaException, IOException {
     ModuleLoader loader = new ModuleLoader();
     URI moduleUri = ObjectUtils.notNull(
         Paths.get("src/test/resources/content/custom-entity-metaschema.xml").toUri());
-    IXmlModule module = loader.load(moduleUri);
+    IMetaschemaModule module = loader.load(moduleUri);
     assertFalse(module.getExportedRootAssemblyDefinitions().isEmpty(), "no roots found");
   }
 
@@ -89,8 +93,9 @@ void testConstraints() throws MetaschemaException, IOException { // NOPMD - inte
     loader.allowEntityResolution();
     URI moduleUri = ObjectUtils.notNull(URI.create(
         "https://raw.githubusercontent.com/usnistgov/OSCAL/v1.0.0/src/metaschema/oscal_complete_metaschema.xml"));
-    IXmlModule module = loader.load(moduleUri);
-    IAssemblyDefinition catalog = module.getExportedAssemblyDefinitionByName("catalog");
+    IMetaschemaModule module = loader.load(moduleUri);
+    IAssemblyDefinition catalog
+        = module.getExportedAssemblyDefinitionByName(new QName("http://csrc.nist.gov/ns/oscal/1.0", "catalog"));
 
     assertNotNull(catalog, "catalog not found");
     List<? extends IConstraint> constraints = catalog.getConstraints();
@@ -101,10 +106,11 @@ void testConstraints() throws MetaschemaException, IOException { // NOPMD - inte
   void testLoadMetaschemaWithExternalEntity() throws MetaschemaException, IOException {
     ModuleLoader loader = new ModuleLoader();
     loader.allowEntityResolution();
-    IXmlModule module
+    IMetaschemaModule module
         = loader.load(ObjectUtils.notNull(Paths.get("src/test/resources/content/custom-entity-metaschema.xml")));
 
-    IAssemblyDefinition root = module.getAssemblyDefinitionByName("root");
+    IAssemblyDefinition root = module.getExportedRootAssemblyDefinitionByName(
+        new QName("http://csrc.nist.gov/ns/test/metaschema/entity", "root"));
     assert root != null;
     List<? extends IAllowedValuesConstraint> allowedValues = root.getAllowedValuesConstraints();
 
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/UsedDefinitionModelWalkerTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/UsedDefinitionModelWalkerTest.java
index 1e2029bb1..9cf2e544e 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/UsedDefinitionModelWalkerTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/model/xml/UsedDefinitionModelWalkerTest.java
@@ -29,6 +29,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import gov.nist.secauto.metaschema.core.model.IDefinition;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.model.UsedDefinitionModelWalker;
 
@@ -50,7 +51,7 @@ void test() throws MetaschemaException, IOException {
     ModuleLoader loader = new ModuleLoader();
     loader.allowEntityResolution();
 
-    IXmlModule module = loader.load(new URL(
+    IMetaschemaModule module = loader.load(new URL(
         "https://raw.githubusercontent.com/usnistgov/OSCAL/v1.0.0/src/metaschema/oscal_complete_metaschema.xml"));
 
     Collection<? extends IDefinition> definitions
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testing/AbstractModelBuilder.java b/core/src/test/java/gov/nist/secauto/metaschema/core/testing/AbstractModelBuilder.java
index 50feb73a2..501fac740 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/testing/AbstractModelBuilder.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/testing/AbstractModelBuilder.java
@@ -30,32 +30,84 @@
 import gov.nist.secauto.metaschema.core.model.IDefinition;
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.core.model.IModelElement;
-import gov.nist.secauto.metaschema.core.model.INamed;
 import gov.nist.secauto.metaschema.core.model.INamedInstance;
+import gov.nist.secauto.metaschema.core.model.INamedModelElement;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 
 import org.apache.commons.lang3.ObjectUtils;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 
+import java.net.URI;
+
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public abstract class AbstractModelBuilder<T extends AbstractModelBuilder<T>>
     extends MockFactory {
 
+  private String namespace;
   private String name;
 
+  /**
+   * Construct a new builder using the provided mocking context.
+   *
+   * @param ctx
+   *          the mocking context
+   */
   protected AbstractModelBuilder(@NonNull Mockery ctx) {
     super(ctx);
   }
 
+  /**
+   * Reset the builder back to a default state.
+   *
+   * @return this builder
+   */
   @NonNull
   @SuppressWarnings("unchecked")
   public T reset() {
     this.name = null;
+    this.namespace = null;
+    return (T) this;
+  }
+
+  /**
+   * Apply the provided namespace to use for names built using this builder.
+   *
+   * @param name
+   *          the namespace to use
+   * @return this builder
+   */
+  @SuppressWarnings("unchecked")
+  @NonNull
+  public T namespace(@NonNull String name) {
+    this.namespace = name;
+    return (T) this;
+  }
+
+  /**
+   * Apply the provided namespace to use for names built using this builder.
+   *
+   * @param name
+   *          the namespace to use
+   * @return this builder
+   */
+  @SuppressWarnings("unchecked")
+  @NonNull
+  public T namespace(@NonNull URI name) {
+    this.namespace = name.toASCIIString();
     return (T) this;
   }
 
+  /**
+   * Apply the provided names to use for names built using this builder.
+   *
+   * @param name
+   *          the name to use
+   * @return this builder
+   */
   @SuppressWarnings("unchecked")
   @NonNull
   public T name(@NonNull String name) {
@@ -63,16 +115,39 @@ public T name(@NonNull String name) {
     return (T) this;
   }
 
+  /**
+   * Validate the data provided to this builder to ensure correct and required
+   * information is provided.
+   */
   protected void validate() {
     ObjectUtils.requireNonEmpty(name, "name");
   }
 
+  /**
+   * Apply expectations to the mocking context for the provided definition.
+   *
+   * @param definition
+   *          the definition to apply mocking expectations for
+   */
   protected void applyDefinition(@NonNull IDefinition definition) {
     applyModelElement(definition);
     applyNamed(definition);
     applyAttributable(definition);
   }
 
+  /**
+   * Apply expectations to the mocking context for the provided instance,
+   * definition, and parent definition.
+   *
+   * @param <DEF>
+   *          the Java type of the definition
+   * @param instance
+   *          the instance to apply mocking expectations for
+   * @param definition
+   *          the definition to apply mocking expectations for
+   * @param parent
+   *          the parent definition to apply mocking expectations for
+   */
   protected <DEF extends IDefinition> void applyNamedInstance(
       @NonNull INamedInstance instance,
       @NonNull DEF definition,
@@ -82,6 +157,10 @@ protected <DEF extends IDefinition> void applyNamedInstance(
     applyAttributable(instance);
     getContext().checking(new Expectations() {
       {
+        allowing(instance).getXmlNamespace();
+        will(returnValue(namespace));
+        allowing(instance).getXmlQName();
+        will(returnValue(new QName(namespace, name)));
         allowing(instance).getDefinition();
         will(returnValue(definition));
         allowing(instance).getContainingDefinition();
@@ -92,7 +171,14 @@ protected <DEF extends IDefinition> void applyNamedInstance(
     });
   }
 
-  protected void applyNamed(@NonNull INamed element) {
+  /**
+   * Apply expectations to the mocking context for the provided named model
+   * element.
+   *
+   * @param element
+   *          the named model element to apply mocking expectations for
+   */
+  protected void applyNamed(@NonNull INamedModelElement element) {
     getContext().checking(new Expectations() {
       {
         allowing(element).getName();
@@ -111,6 +197,13 @@ protected void applyNamed(@NonNull INamed element) {
     });
   }
 
+  /**
+   * Apply expectations to the mocking context for the provided attributable
+   * element.
+   *
+   * @param element
+   *          the element to apply mocking expectations for
+   */
   protected void applyAttributable(@NonNull IAttributable element) {
     getContext().checking(new Expectations() {
       {
@@ -120,6 +213,12 @@ protected void applyAttributable(@NonNull IAttributable element) {
     });
   }
 
+  /**
+   * Apply expectations to the mocking context for the provided model element.
+   *
+   * @param element
+   *          the model element to apply mocking expectations for
+   */
   protected void applyModelElement(@NonNull IModelElement element) {
     getContext().checking(new Expectations() {
       {
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testing/AssemblyBuilder.java b/core/src/test/java/gov/nist/secauto/metaschema/core/testing/AssemblyBuilder.java
index df1d2f575..07a985fd7 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/testing/AssemblyBuilder.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/testing/AssemblyBuilder.java
@@ -40,6 +40,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -54,6 +56,13 @@ private AssemblyBuilder(@NonNull Mockery ctx) {
     super(ctx);
   }
 
+  /**
+   * Create a new builder using the provided mocking context.
+   *
+   * @param ctx
+   *          the mocking context
+   * @return the new builder
+   */
   @NonNull
   public static AssemblyBuilder builder(@NonNull Mockery ctx) {
     return new AssemblyBuilder(ctx).reset();
@@ -66,11 +75,25 @@ public AssemblyBuilder reset() {
     return this;
   }
 
+  /**
+   * Use the provided flag instances for built fields.
+   *
+   * @param flags
+   *          the flags to use
+   * @return this builder
+   */
   public AssemblyBuilder flags(@Nullable List<FlagBuilder> flags) {
     this.flags = flags == null ? CollectionUtil.emptyList() : flags;
     return this;
   }
 
+  /**
+   * Use the provided model instances for built fields.
+   *
+   * @param modelInstances
+   *          the model instances to use
+   * @return this builder
+   */
   public AssemblyBuilder modelInstances(@Nullable List<? extends IModelInstanceBuilder> modelInstances) {
     this.modelInstances = modelInstances == null ? CollectionUtil.emptyList() : modelInstances;
     return this;
@@ -84,6 +107,16 @@ public IAssemblyInstanceAbsolute toInstance(
     return toInstance(parent, def);
   }
 
+  /**
+   * Build a mocked assembly instance, using the provided definition, as a child
+   * of the provided parent.
+   *
+   * @param parent
+   *          the parent containing the new instance
+   * @param definition
+   *          the definition to base the instance on
+   * @return the new mocked instance
+   */
   @NonNull
   public IAssemblyInstanceAbsolute toInstance(
       @NonNull IAssemblyDefinition parent,
@@ -95,6 +128,11 @@ public IAssemblyInstanceAbsolute toInstance(
     return retval;
   }
 
+  /**
+   * Build a mocked assembly definition.
+   *
+   * @return the new mocked definition
+   */
   @SuppressWarnings("null")
   @NonNull
   public IAssemblyDefinition toDefinition() {
@@ -103,16 +141,16 @@ public IAssemblyDefinition toDefinition() {
     IAssemblyDefinition retval = mock(IAssemblyDefinition.class);
     applyDefinition(retval);
 
-    Map<String, IFlagInstance> flags = this.flags.stream()
+    Map<QName, IFlagInstance> flags = this.flags.stream()
         .map(builder -> builder.toInstance(retval))
         .collect(Collectors.toUnmodifiableMap(
-            IFlagInstance::getEffectiveName,
+            IFlagInstance::getXmlQName,
             Function.identity()));
 
-    Map<String, ? extends INamedModelInstanceAbsolute> modelInstances = this.modelInstances.stream()
+    Map<QName, ? extends INamedModelInstanceAbsolute> modelInstances = this.modelInstances.stream()
         .map(builder -> builder.toInstance(retval))
         .collect(Collectors.toUnmodifiableMap(
-            INamedModelInstanceAbsolute::getEffectiveName,
+            INamedModelInstanceAbsolute::getXmlQName,
             Function.identity()));
 
     getContext().checking(new Expectations() {
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testing/FieldBuilder.java b/core/src/test/java/gov/nist/secauto/metaschema/core/testing/FieldBuilder.java
index cb5d3aa68..12517568d 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/testing/FieldBuilder.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/testing/FieldBuilder.java
@@ -42,6 +42,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -57,6 +59,13 @@ private FieldBuilder(@NonNull Mockery ctx) {
     super(ctx);
   }
 
+  /**
+   * Create a new builder using the provided mocking context.
+   *
+   * @param ctx
+   *          the mocking context
+   * @return the new builder
+   */
   @NonNull
   public static FieldBuilder builder(@NonNull Mockery ctx) {
     return new FieldBuilder(ctx).reset();
@@ -70,21 +79,50 @@ public FieldBuilder reset() {
     return this;
   }
 
+  /**
+   * Apply the provided data type adapter to built fields.
+   *
+   * @param dataTypeAdapter
+   *          the data type adapter to use
+   * @return this builder
+   */
   public FieldBuilder dataTypeAdapter(@NonNull IDataTypeAdapter<?> dataTypeAdapter) {
     this.dataTypeAdapter = dataTypeAdapter;
     return this;
   }
 
+  /**
+   * Apply the provided data type adapter to built fields.
+   *
+   * @param defaultValue
+   *          the default value to use
+   * @return this builder
+   */
   public FieldBuilder defaultValue(@NonNull Object defaultValue) {
     this.defaultValue = defaultValue;
     return this;
   }
 
+  /**
+   * Use the provided flag instances for built fields.
+   *
+   * @param flags
+   *          the flags to use
+   * @return this builder
+   */
   public FieldBuilder flags(@Nullable List<FlagBuilder> flags) {
     this.flags = flags == null ? CollectionUtil.emptyList() : flags;
     return this;
   }
 
+  /**
+   * Build a mocked field instance, based on a mocked definition, as a child of
+   * the provided parent.
+   *
+   * @param parent
+   *          the parent containing the new instance
+   * @return the new mocked instance
+   */
   @Override
   @NonNull
   public IFieldInstanceAbsolute toInstance(
@@ -93,6 +131,16 @@ public IFieldInstanceAbsolute toInstance(
     return toInstance(parent, def);
   }
 
+  /**
+   * Build a mocked field instance, using the provided definition, as a child of
+   * the provided parent.
+   *
+   * @param parent
+   *          the parent containing the new instance
+   * @param definition
+   *          the definition to base the instance on
+   * @return the new mocked instance
+   */
   @NonNull
   public IFieldInstanceAbsolute toInstance(
       @NonNull IAssemblyDefinition parent,
@@ -104,6 +152,11 @@ public IFieldInstanceAbsolute toInstance(
     return retval;
   }
 
+  /**
+   * Build a mocked field definition.
+   *
+   * @return the new mocked definition
+   */
   @SuppressWarnings("null")
   @NonNull
   public IFieldDefinition toDefinition() {
@@ -112,10 +165,10 @@ public IFieldDefinition toDefinition() {
     IFieldDefinition retval = mock(IFieldDefinition.class);
     applyDefinition(retval);
 
-    Map<String, IFlagInstance> flags = this.flags.stream()
+    Map<QName, IFlagInstance> flags = this.flags.stream()
         .map(builder -> builder.toInstance(retval))
         .collect(Collectors.toUnmodifiableMap(
-            IFlagInstance::getEffectiveName,
+            IFlagInstance::getXmlQName,
             Function.identity()));
 
     getContext().checking(new Expectations() {
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testing/FlagBuilder.java b/core/src/test/java/gov/nist/secauto/metaschema/core/testing/FlagBuilder.java
index 544a32e61..9feef96d9 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/testing/FlagBuilder.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/testing/FlagBuilder.java
@@ -26,6 +26,8 @@
 
 package gov.nist.secauto.metaschema.core.testing;
 
+import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
@@ -35,15 +37,27 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+/**
+ * A builder that generates mock flag definitions and instances.
+ */
 public final class FlagBuilder
     extends AbstractModelBuilder<FlagBuilder> {
 
+  private IDataTypeAdapter<?> dataTypeAdapter;
+  private Object defaultValue = null;
   private boolean required;
 
   private FlagBuilder(@NonNull Mockery ctx) {
     super(ctx);
   }
 
+  /**
+   * Create a new builder using the provided mocking context.
+   *
+   * @param ctx
+   *          the mocking context
+   * @return the new builder
+   */
   @NonNull
   public static FlagBuilder builder(@NonNull Mockery ctx) {
     return new FlagBuilder(ctx).reset();
@@ -51,22 +65,72 @@ public static FlagBuilder builder(@NonNull Mockery ctx) {
 
   @Override
   public FlagBuilder reset() {
+    this.dataTypeAdapter = MetaschemaDataTypeProvider.DEFAULT_DATA_TYPE;
+    this.defaultValue = null;
     this.required = IFlagInstance.DEFAULT_FLAG_REQUIRED;
     return this;
   }
 
+  /**
+   * Apply the provided required setting to built flags.
+   *
+   * @param required
+   *          {@code true} if the flag is required or {@code false} otherwise
+   * @return this builder
+   */
   public FlagBuilder required(boolean required) {
     this.required = required;
     return this;
   }
 
+  /**
+   * Apply the provided data type adapter to built flags.
+   *
+   * @param dataTypeAdapter
+   *          the data type adapter to use
+   * @return this builder
+   */
+  public FlagBuilder dataTypeAdapter(@NonNull IDataTypeAdapter<?> dataTypeAdapter) {
+    this.dataTypeAdapter = dataTypeAdapter;
+    return this;
+  }
+
+  /**
+   * Apply the provided data type adapter to built flags.
+   *
+   * @param defaultValue
+   *          the default value to use
+   * @return this builder
+   */
+  public FlagBuilder defaultValue(@NonNull Object defaultValue) {
+    this.defaultValue = defaultValue;
+    return this;
+  }
+
+  /**
+   * Build a mocked flag instance, based on a mocked definition, as a child of the
+   * provided parent.
+   *
+   * @param parent
+   *          the parent containing the new instance
+   * @return the new mocked instance
+   */
   @NonNull
-  public IFlagInstance toInstance(
-      @NonNull IModelDefinition parent) {
+  public IFlagInstance toInstance(@NonNull IModelDefinition parent) {
     IFlagDefinition def = toDefinition();
     return toInstance(parent, def);
   }
 
+  /**
+   * Build a mocked flag instance, using the provided definition, as a child of
+   * the provided parent.
+   *
+   * @param parent
+   *          the parent containing the new instance
+   * @param definition
+   *          the definition to base the instance on
+   * @return the new mocked instance
+   */
   @NonNull
   public IFlagInstance toInstance(
       @NonNull IModelDefinition parent,
@@ -87,19 +151,26 @@ public IFlagInstance toInstance(
     return retval;
   }
 
+  /**
+   * Build a mocked flag definition.
+   *
+   * @return the new mocked definition
+   */
   @NonNull
   public IFlagDefinition toDefinition() {
     validate();
 
     IFlagDefinition retval = mock(IFlagDefinition.class);
     applyDefinition(retval);
+
+    getContext().checking(new Expectations() {
+      {
+        allowing(retval).getJavaTypeAdapter();
+        will(returnValue(dataTypeAdapter));
+        allowing(retval).getDefaultValue();
+        will(returnValue(defaultValue));
+      }
+    });
     return retval;
   }
-
-  // @Override
-  // public Object getValue(Object parentInstance) {
-  // // TODO Auto-generated method stub
-  // return null;
-  // }
-  // }
 }
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/testing/MockedModelTestSupport.java b/core/src/test/java/gov/nist/secauto/metaschema/core/testing/MockedModelTestSupport.java
index 0ecbd3327..ad35042ec 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/testing/MockedModelTestSupport.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/testing/MockedModelTestSupport.java
@@ -37,16 +37,31 @@ public class MockedModelTestSupport implements IMockFactory {
   @NonNull
   Mockery context = new JUnit5Mockery();
 
+  /**
+   * Get a new flag builder.
+   *
+   * @return the builder
+   */
   @NonNull
   protected FlagBuilder flag() {
     return FlagBuilder.builder(context);
   }
 
+  /**
+   * Get a new field builder.
+   *
+   * @return the builder
+   */
   @NonNull
   protected FieldBuilder field() {
     return FieldBuilder.builder(context);
   }
 
+  /**
+   * Get a new assembly builder.
+   *
+   * @return the builder
+   */
   @NonNull
   protected AssemblyBuilder assembly() {
     return AssemblyBuilder.builder(context);
diff --git a/core/src/test/java/gov/nist/secauto/metaschema/core/util/UriUtilsTest.java b/core/src/test/java/gov/nist/secauto/metaschema/core/util/UriUtilsTest.java
index 62ce23b62..6a95f7742 100644
--- a/core/src/test/java/gov/nist/secauto/metaschema/core/util/UriUtilsTest.java
+++ b/core/src/test/java/gov/nist/secauto/metaschema/core/util/UriUtilsTest.java
@@ -26,13 +26,18 @@
 
 package gov.nist.secauto.metaschema.core.util;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.stream.Stream;
@@ -40,37 +45,97 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 class UriUtilsTest {
-  private static final boolean VALID = true;
-  private static final boolean INVALID = false;
-
-  private static Stream<Arguments> provideValuesTestToUri() {
+  private static Stream<Arguments> provideValuesTestToUri() throws MalformedURLException, URISyntaxException {
+    String base = Paths.get("").toAbsolutePath().toUri().toURL().toURI().toASCIIString();
     return Stream.of(
-        Arguments.of("http://example.org/valid", VALID),
-        Arguments.of("https://example.org/valid", VALID),
-        Arguments.of("http://example.org/valid", VALID),
-        Arguments.of("ftp://example.org/valid", VALID),
-        Arguments.of("ssh://example.org/valid", VALID),
-        Arguments.of("example.org/good", VALID),
-        Arguments.of("bad.txt", VALID),
-        Arguments.of("relative\\windows\\path\\resource.txt", VALID),
-        Arguments.of("C:\\absolute\\valid.txt", VALID),
-        Arguments.of("local/relative/path/is/invalid.txt", VALID),
-        Arguments.of("/absolute/local/path/is/invalid.txt", VALID),
-        Arguments.of("1;", VALID));
+        Arguments.of("http://example.org/valid", "http://example.org/valid", true),
+        Arguments.of("https://example.org/valid", "https://example.org/valid", true),
+        Arguments.of("http://example.org/valid", "http://example.org/valid", true),
+        Arguments.of("ftp://example.org/valid", "ftp://example.org/valid", true),
+        // Arguments.of("ssh://example.org/valid", "ssh://example.org/valid", true),
+        Arguments.of("example.org/good", base + "example.org/good", true),
+        Arguments.of("bad.txt", base + "bad.txt", true),
+        // Arguments.of("relative\\windows\\path\\resource.txt", base +
+        // "relative/windows/path/resource.txt", true),
+        // Arguments.of("C:\\absolute\\valid.txt", "C:\\absolute\\valid.txt",true),
+        Arguments.of("local/relative/path/is/invalid.txt", base + "local/relative/path/is/invalid.txt", true),
+        // Arguments.of("/absolute/local/path/is/invalid.txt", true),
+        Arguments.of("1;", base + "1;", true));
   }
 
   @ParameterizedTest
   @MethodSource("provideValuesTestToUri")
-  void testToUri(@NonNull String location, boolean expectedResult) {
-    boolean result = INVALID;
+  void testToUri(@NonNull String location, @NonNull String expectedLocation, boolean expectedResult)
+      throws MalformedURLException {
     Path cwd = Paths.get("");
     try {
-      URI uri = UriUtils.toUri(location, cwd.toAbsolutePath().toUri());
-      result = VALID;
+      URI uri = UriUtils.toUri(location, ObjectUtils.notNull(cwd.toAbsolutePath().toUri())).normalize().toURL().toURI();
       System.out.println(String.format("%s -> %s", location, uri.toASCIIString()));
-    } catch (Exception ex) {
-      ex.printStackTrace();
+      assertAll(
+          () -> assertEquals(uri.toASCIIString(), expectedLocation),
+          () -> assertTrue(expectedResult));
+    } catch (URISyntaxException ex) {
+      assertFalse(expectedResult);
     }
-    assertEquals(result, expectedResult);
+  }
+
+  private static Stream<Arguments> provideArgumentsTestRelativize() {
+    return Stream.of(
+        Arguments.of(
+            "http://example.com/this/file1.txt",
+            "http://example.com/this/file2.txt",
+            true,
+            "file2.txt"),
+        Arguments.of(
+            "http://example.com/this",
+            "http://example.com/this/that",
+            true,
+            "that"),
+        Arguments.of(
+            "http://example.com/this/",
+            "http://example.com/this/that",
+            true,
+            "that"),
+        Arguments.of(
+            "http://example.com/this/that",
+            "http://example.com/this/new",
+            true,
+            "new"),
+        Arguments.of(
+            "http://example.com/this/that/A",
+            "http://example.com/this/new/B",
+            true,
+            "../new/B"),
+        Arguments.of(
+            "http://example.com/this/that/",
+            "http://example.com/this/new/",
+            true,
+            "../new/"),
+        Arguments.of(
+            "http://example.com/this/that/A/",
+            "http://example.com/this/new/B",
+            true,
+            "../../new/B"),
+        Arguments.of(
+            "http://example.com/this/that/A/X/file1,text",
+            "http://example.com/this/that/A/file2.txt",
+            true,
+            "../file2.txt"),
+        Arguments.of(
+            "http://example.com/this/that/A/",
+            "http://example.org/this/new/B",
+            true,
+            "http://example.org/this/new/B"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("provideArgumentsTestRelativize")
+  void testRelativize(@NonNull String uri1, @NonNull String uri2, boolean prepend, @NonNull String expected)
+      throws URISyntaxException {
+    URI thisUri = URI.create(uri1);
+    URI thatUri = URI.create(uri2);
+
+    URI result = UriUtils.relativize(thisUri, thatUri, prepend);
+    assertEquals(expected, result.toASCIIString());
   }
 }
diff --git a/core/src/test/resources/log4j2-test.xml b/core/src/test/resources/log4j2-test.xml
index 84f3107d0..d1be80f33 100644
--- a/core/src/test/resources/log4j2-test.xml
+++ b/core/src/test/resources/log4j2-test.xml
@@ -13,7 +13,7 @@
 		<Logger name="gov.nist.secauto.metaschema" level="info" additivity="false">
 			<AppenderRef ref="console" />
 		</Logger>
-<!-- 		
+<!-- 
 		<Logger name="gov.nist.secauto.metaschema.core.metapath" level="debug" additivity="false">
 			<AppenderRef ref="console" />
 		</Logger>
diff --git a/databind-metaschema/pom.xml b/databind-metaschema/pom.xml
index fe954bf62..260bfe7d0 100644
--- a/databind-metaschema/pom.xml
+++ b/databind-metaschema/pom.xml
@@ -7,9 +7,9 @@
 		<version>1.0.0-M2-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>metaschema-databind-metaschema</artifactId>
+	<artifactId>metaschema-databind-modules</artifactId>
 
-	<name>Metaschema Format Databinding</name>
+	<name>Metaschema Modules</name>
 
 	<url>${site.url}${project.artifactId}/</url>
 	<distributionManagement>
@@ -58,6 +58,27 @@
 		</resources>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-toolchains-plugin</artifactId>
+					<version>${plugin.maven-toolchains.version}</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>toolchain</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<toolchains>
+							<jdk>
+								<version>11</version>
+								<vendor>temurin</vendor>
+							</jdk>
+						</toolchains>
+					</configuration>
+				</plugin>
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-pmd-plugin</artifactId>
@@ -75,6 +96,13 @@
 							**/gov/nist/secauto/metaschema/metaschema/model/**/*</excludes>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>com.github.spotbugs</groupId>
+					<artifactId>spotbugs-maven-plugin</artifactId>
+					<configuration>
+						<excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -83,8 +111,59 @@
 				<artifactId>metaschema-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<executions>
+<!--					<execution>-->
+<!--						<id>metaschema-codegen</id>-->
+<!--						<phase>generate-sources</phase>-->
+<!--						<goals>-->
+<!--							<goal>generate-sources</goal>-->
+<!--						</goals>-->
+<!--						<configuration>-->
+<!--							<metaschemaDir>${project.basedir}/../core/metaschema/schema/metaschema</metaschemaDir>-->
+<!--							<outputDirectory>${project.build.directory}/generated-sources/metaschema</outputDirectory>-->
+<!--							<configs>-->
+<!--								<config>${project.basedir}/src/main/metaschema-bindings/metaschema-metaschema-bindings.xml</config>-->
+<!--							</configs>-->
+<!--							<includes>-->
+<!--								<include>metaschema-module-metaschema.xml</include>-->
+<!--							</includes>-->
+<!--						</configuration>-->
+<!--					</execution>-->
+					<execution>
+						<id>metaschema-xml-schema</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate-schemas</goal>
+						</goals>
+						<configuration>
+							<metaschemaDir>${project.basedir}/../core/metaschema/schema/metaschema</metaschemaDir>
+							<outputDirectory>${project.build.directory}/generated-resources/schema/xml</outputDirectory>
+							<includes>
+								<include>metaschema-module-metaschema.xml</include>
+							</includes>
+							<formats>
+								<format>xsd</format>
+							</formats>
+						</configuration>
+					</execution>
+					<execution>
+						<id>metaschema-json-schema</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate-schemas</goal>
+						</goals>
+						<configuration>
+							<metaschemaDir>${project.basedir}/../core/metaschema/schema/metaschema</metaschemaDir>
+							<outputDirectory>${project.build.directory}/generated-resources/schema/json</outputDirectory>
+							<includes>
+								<include>metaschema-module-metaschema.xml</include>
+							</includes>
+							<formats>
+								<format>json</format>
+							</formats>
+						</configuration>
+					</execution>
 					<execution>
-						<id>metaschema-codegen</id>
+						<id>sarif-codegen</id>
 						<phase>generate-sources</phase>
 						<goals>
 							<goal>generate-sources</goal>
@@ -92,47 +171,45 @@
 						<configuration>
 							<metaschemaDir>${project.basedir}/../core/metaschema/schema/metaschema</metaschemaDir>
 							<outputDirectory>${project.build.directory}/generated-sources/metaschema</outputDirectory>
-							<configs>
-								<config>
-									${project.basedir}/src/main/metaschema-bindings/metaschema-metaschema-bindings.xml</config>
-							</configs>
 							<includes>
-								<include>metaschema-module-metaschema.xml</include>
+								<include>sarif-module.xml</include>
 							</includes>
 						</configuration>
 					</execution>
-<!--					<execution>-->
-<!--						<id>generate-xml-schemas</id>-->
-<!--						<goals>-->
-<!--							<goal>generate-schemas</goal>-->
-<!--						</goals>-->
-<!--						<configuration>-->
-<!--							<metaschemaDir>${project.basedir}/../core/metaschema/schema/metaschema</metaschemaDir>-->
-<!--							<outputDirectory>${project.build.directory}/generated-resources/metaschema/schema/xml</outputDirectory>-->
-<!--							<includes>-->
-<!--								<include>metaschema-metaschema.xml</include>-->
-<!--							</includes>-->
-<!--							<formats>-->
-<!--								<format>xsd</format>-->
-<!--							</formats>-->
-<!--						</configuration>-->
-<!--					</execution>-->
-<!--					<execution>-->
-<!--						<id>generate-json-schemas</id>-->
-<!--						<goals>-->
-<!--							<goal>generate-schemas</goal>-->
-<!--						</goals>-->
-<!--						<configuration>-->
-<!--							<metaschemaDir>${project.basedir}/../core/metaschema/schema/metaschema</metaschemaDir>-->
-<!--							<outputDirectory>${project.build.directory}/generated-resources/oscal/schema/json</outputDirectory>-->
-<!--							<includes>-->
-<!--								<include>metaschema-metaschema.xml</include>-->
-<!--							</includes>-->
-<!--							<formats>-->
-<!--								<format>json</format>-->
-<!--							</formats>-->
-<!--						</configuration>-->
-<!--					</execution>-->
+					<execution>
+						<id>sarif-xml-schema</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate-schemas</goal>
+						</goals>
+						<configuration>
+							<metaschemaDir>${project.basedir}/../core/metaschema/schema/metaschema</metaschemaDir>
+							<outputDirectory>${project.build.directory}/generated-resources/schema/xml</outputDirectory>
+							<includes>
+								<include>sarif-module.xml</include>
+							</includes>
+							<formats>
+								<format>xsd</format>
+							</formats>
+						</configuration>
+					</execution>
+					<execution>
+						<id>sarif-json-schema</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate-schemas</goal>
+						</goals>
+						<configuration>
+							<metaschemaDir>${project.basedir}/../core/metaschema/schema/metaschema</metaschemaDir>
+							<outputDirectory>${project.build.directory}/generated-resources/schema/json</outputDirectory>
+							<includes>
+								<include>sarif-module.xml</include>
+							</includes>
+							<formats>
+								<format>json</format>
+							</formats>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
diff --git a/databind-metaschema/src/main/java/gov/nist/secauto/metaschema/modules/sarif/SarifValidationHandler.java b/databind-metaschema/src/main/java/gov/nist/secauto/metaschema/modules/sarif/SarifValidationHandler.java
new file mode 100644
index 000000000..ef46b7a3c
--- /dev/null
+++ b/databind-metaschema/src/main/java/gov/nist/secauto/metaschema/modules/sarif/SarifValidationHandler.java
@@ -0,0 +1,522 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.modules.sarif;
+
+import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
+import gov.nist.secauto.metaschema.core.model.IResourceLocation;
+import gov.nist.secauto.metaschema.core.model.constraint.ConstraintValidationFinding;
+import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
+import gov.nist.secauto.metaschema.core.model.constraint.IConstraint.Level;
+import gov.nist.secauto.metaschema.core.model.validation.IValidationFinding;
+import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding;
+import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.util.IVersionInfo;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+import gov.nist.secauto.metaschema.core.util.UriUtils;
+import gov.nist.secauto.metaschema.databind.IBindingContext;
+import gov.nist.secauto.metaschema.databind.io.Format;
+import gov.nist.secauto.metaschema.databind.io.SerializationFeature;
+
+import org.schemastore.json.sarif.x210.Artifact;
+import org.schemastore.json.sarif.x210.ArtifactLocation;
+import org.schemastore.json.sarif.x210.Location;
+import org.schemastore.json.sarif.x210.LogicalLocation;
+import org.schemastore.json.sarif.x210.Message;
+import org.schemastore.json.sarif.x210.MultiformatMessageString;
+import org.schemastore.json.sarif.x210.PhysicalLocation;
+import org.schemastore.json.sarif.x210.Region;
+import org.schemastore.json.sarif.x210.ReportingDescriptor;
+import org.schemastore.json.sarif.x210.Result;
+import org.schemastore.json.sarif.x210.Run;
+import org.schemastore.json.sarif.x210.Sarif;
+import org.schemastore.json.sarif.x210.Tool;
+import org.schemastore.json.sarif.x210.ToolComponent;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+public final class SarifValidationHandler {
+  private enum Kind {
+    NOT_APPLICABLE("notApplicable"),
+    PASS("pass"),
+    FAIL("fail"),
+    REVIEW("review"),
+    OPEN("open"),
+    INFORMATIONAL("informational");
+
+    @NonNull
+    private final String label;
+
+    Kind(@NonNull String label) {
+      this.label = label;
+    }
+
+    @NonNull
+    public String getLabel() {
+      return label;
+    }
+  }
+
+  private enum SeverityLevel {
+    NONE("none"),
+    NOTE("note"),
+    WARNING("warning"),
+    ERROR("error");
+
+    @NonNull
+    private final String label;
+
+    SeverityLevel(@NonNull String label) {
+      this.label = label;
+    }
+
+    @NonNull
+    public String getLabel() {
+      return label;
+    }
+  }
+
+  @NonNull
+  private final URI source;
+  @Nullable
+  private final IVersionInfo toolVersion;
+  private final AtomicInteger artifactIndex = new AtomicInteger(-1);
+  private final AtomicInteger ruleIndex = new AtomicInteger(-1);
+  @NonNull
+  private final Map<URI, ArtifactRecord> artifacts = new LinkedHashMap<>();
+  @NonNull
+  private final Map<IConstraint, RuleRecord> rules = new LinkedHashMap<>();
+  @NonNull
+  private final List<IResult> results = new LinkedList<>();
+
+  public SarifValidationHandler(
+      @NonNull URI source,
+      @Nullable IVersionInfo toolVersion) {
+    if (!source.isAbsolute()) {
+      throw new IllegalArgumentException(String.format("The source URI '%s' is not absolute.", source.toASCIIString()));
+    }
+
+    this.source = source;
+    this.toolVersion = toolVersion;
+  }
+
+  public URI getSource() {
+    return source;
+  }
+
+  public IVersionInfo getToolVersion() {
+    return toolVersion;
+  }
+
+  public void addFindings(@NonNull List<? extends IValidationFinding> findings) {
+    for (IValidationFinding finding : findings) {
+      assert finding != null;
+      addFinding(finding);
+    }
+  }
+
+  public void addFinding(@NonNull IValidationFinding finding) {
+    if (finding instanceof JsonValidationFinding) {
+      addJsonValidationFinding((JsonValidationFinding) finding);
+    } else if (finding instanceof XmlValidationFinding) {
+      addXmlValidationFinding((XmlValidationFinding) finding);
+    } else if (finding instanceof ConstraintValidationFinding) {
+      addConstraintValidationFinding((ConstraintValidationFinding) finding);
+    } else {
+      throw new IllegalStateException();
+    }
+  }
+
+  public URI relativize(@NonNull URI output, @NonNull URI artifact) throws IOException {
+    try {
+      return UriUtils.relativize(output, artifact, true);
+    } catch (URISyntaxException ex) {
+      throw new IOException(ex);
+    }
+  }
+
+  private RuleRecord getRuleRecord(@NonNull IConstraint constraint) {
+    RuleRecord retval = rules.get(constraint);
+    if (retval == null) {
+      retval = new RuleRecord(constraint);
+      rules.put(constraint, retval);
+    }
+    return retval;
+  }
+
+  private ArtifactRecord getArtifactRecord(@NonNull URI artifactUri) {
+    ArtifactRecord retval = artifacts.get(artifactUri);
+    if (retval == null) {
+      retval = new ArtifactRecord(artifactUri);
+      artifacts.put(artifactUri, retval);
+    }
+    return retval;
+  }
+
+  private void addJsonValidationFinding(@NonNull JsonValidationFinding finding) {
+    results.add(new SchemaResult(finding));
+  }
+
+  private void addXmlValidationFinding(@NonNull XmlValidationFinding finding) {
+    results.add(new SchemaResult(finding));
+  }
+
+  private void addConstraintValidationFinding(@NonNull ConstraintValidationFinding finding) {
+    results.add(new ConstraintResult(finding));
+  }
+
+  public void write(@NonNull Path outputFile) throws IOException {
+
+    URI output = outputFile.toUri();
+
+    Sarif sarif = new Sarif();
+    sarif.setVersion("2.1.0");
+
+    Run run = new Run();
+
+    sarif.addRun(run);
+
+    Artifact artifact = new Artifact();
+
+    artifact.setLocation(getArtifactRecord(source).generateArtifactLocation(output));
+
+    run.addArtifact(artifact);
+
+    for (IResult result : results) {
+      result.generateResults(output).forEach(run::addResult);
+    }
+
+    if (!rules.isEmpty() || toolVersion != null) {
+      Tool tool = new Tool();
+      ToolComponent driver = new ToolComponent();
+
+      IVersionInfo toolVersion = getToolVersion();
+      if (toolVersion != null) {
+        driver.setName(toolVersion.getName());
+        driver.setVersion(toolVersion.getVersion());
+      }
+
+      for (RuleRecord rule : rules.values()) {
+        driver.addRule(rule.generate());
+      }
+
+      tool.setDriver(driver);
+      run.setTool(tool);
+    }
+
+    IBindingContext.instance().newSerializer(Format.JSON, Sarif.class)
+        .disableFeature(SerializationFeature.SERIALIZE_ROOT)
+        .serialize(
+            sarif,
+            outputFile,
+            StandardOpenOption.CREATE,
+            StandardOpenOption.WRITE,
+            StandardOpenOption.TRUNCATE_EXISTING);
+  }
+
+  private interface IResult {
+    @NonNull
+    IValidationFinding getFinding();
+
+    @NonNull
+    List<Result> generateResults(@NonNull URI output) throws IOException;
+  }
+
+  private abstract class AbstractResult<T extends IValidationFinding> implements IResult {
+    @NonNull
+    private final T finding;
+
+    protected AbstractResult(@NonNull T finding) {
+      this.finding = finding;
+    }
+
+    @Override
+    public T getFinding() {
+      return finding;
+    }
+
+    @NonNull
+    protected Kind kind(@NonNull IValidationFinding finding) {
+      IValidationFinding.Kind kind = finding.getKind();
+
+      Kind retval;
+      switch (kind) {
+      case FAIL:
+        retval = Kind.FAIL;
+        break;
+      case INFORMATIONAL:
+        retval = Kind.INFORMATIONAL;
+        break;
+      case NOT_APPLICABLE:
+        retval = Kind.NOT_APPLICABLE;
+        break;
+      case PASS:
+        retval = Kind.PASS;
+        break;
+      default:
+        throw new IllegalArgumentException(String.format("Invalid finding kind '%s'.", kind));
+      }
+      return retval;
+    }
+
+    @NonNull
+    protected SeverityLevel level(@NonNull Level severity) {
+      SeverityLevel retval;
+      switch (severity) {
+      case CRITICAL:
+      case ERROR:
+        retval = SeverityLevel.ERROR;
+        break;
+      case INFORMATIONAL:
+      case DEBUG:
+        retval = SeverityLevel.NOTE;
+        break;
+      case WARNING:
+        retval = SeverityLevel.WARNING;
+        break;
+      case NONE:
+        retval = SeverityLevel.NONE;
+        break;
+      default:
+        throw new IllegalArgumentException(String.format("Invalid severity '%s'.", severity));
+      }
+      return retval;
+    }
+
+    protected void message(@NonNull IValidationFinding finding, @NonNull Result result) {
+      String message = finding.getMessage();
+      if (message == null) {
+        message = "";
+      }
+
+      Message msg = new Message();
+      msg.setText(message);
+      result.setMessage(msg);
+    }
+
+    protected void location(@NonNull IValidationFinding finding, @NonNull Result result, @NonNull URI base)
+        throws IOException {
+      IResourceLocation location = finding.getLocation();
+      if (location != null) {
+        // region
+        Region region = new Region();
+
+        if (location.getLine() > -1) {
+          region.setStartLine(BigInteger.valueOf(location.getLine()));
+          region.setEndLine(BigInteger.valueOf(location.getLine()));
+        }
+        if (location.getColumn() > -1) {
+          region.setStartColumn(BigInteger.valueOf(location.getColumn()));
+          region.setEndColumn(BigInteger.valueOf(location.getColumn() + 1));
+        }
+        if (location.getByteOffset() > -1) {
+          region.setByteOffset(BigInteger.valueOf(location.getByteOffset()));
+          region.setByteLength(BigInteger.ZERO);
+        }
+        if (location.getCharOffset() > -1) {
+          region.setCharOffset(BigInteger.valueOf(location.getCharOffset()));
+          region.setCharLength(BigInteger.ZERO);
+        }
+
+        PhysicalLocation physical = new PhysicalLocation();
+
+        URI documentUri = finding.getDocumentUri();
+        if (documentUri != null) {
+          physical.setArtifactLocation(getArtifactRecord(documentUri).generateArtifactLocation(base));
+        }
+        physical.setRegion(region);
+
+        LogicalLocation logical = new LogicalLocation();
+
+        logical.setDecoratedName(finding.getPath());
+
+        Location loc = new Location();
+        loc.setPhysicalLocation(physical);
+        loc.setLogicalLocation(logical);
+        result.addLocation(loc);
+      }
+    }
+  }
+
+  private class SchemaResult
+      extends AbstractResult<IValidationFinding> {
+
+    protected SchemaResult(@NonNull IValidationFinding finding) {
+      super(finding);
+    }
+
+    @Override
+    public List<Result> generateResults(@NonNull URI output) throws IOException {
+      IValidationFinding finding = getFinding();
+
+      Result result = new Result();
+
+      result.setKind(kind(finding).getLabel());
+      result.setLevel(level(finding.getSeverity()).getLabel());
+      message(finding, result);
+      location(finding, result, output);
+
+      return CollectionUtil.singletonList(result);
+    }
+  }
+
+  private class ConstraintResult
+      extends AbstractResult<ConstraintValidationFinding> {
+
+    protected ConstraintResult(@NonNull ConstraintValidationFinding finding) {
+      super(finding);
+    }
+
+    @Override
+    public List<Result> generateResults(@NonNull URI output) throws IOException {
+      ConstraintValidationFinding finding = getFinding();
+
+      List<Result> retval = new LinkedList<>();
+
+      Kind kind = kind(finding);
+      SeverityLevel level = level(finding.getSeverity());
+
+      for (IConstraint constraint : finding.getConstraints()) {
+        assert constraint != null;
+        RuleRecord rule = getRuleRecord(constraint);
+
+        Result result = new Result();
+
+        String id = constraint.getId();
+        if (id != null) {
+          result.setRuleId(id);
+        }
+        result.setRuleIndex(BigInteger.valueOf(rule.getIndex()));
+        result.setGuid(rule.getGuid());
+        result.setKind(kind.getLabel());
+        result.setLevel(level.getLabel());
+        message(finding, result);
+        location(finding, result, output);
+
+        retval.add(result);
+      }
+      return retval;
+    }
+  }
+
+  private class RuleRecord {
+    private final int index;
+    @NonNull
+    private final UUID guid;
+    @NonNull
+    private final IConstraint constraint;
+
+    public RuleRecord(@NonNull IConstraint constraint) {
+      this.guid = ObjectUtils.notNull(UUID.randomUUID());
+      this.constraint = constraint;
+      this.index = ruleIndex.addAndGet(1);
+    }
+
+    public int getIndex() {
+      return index;
+    }
+
+    @NonNull
+    public UUID getGuid() {
+      return guid;
+    }
+
+    public IConstraint getConstraint() {
+      return constraint;
+    }
+
+    @NonNull
+    private ReportingDescriptor generate() {
+      ReportingDescriptor retval = new ReportingDescriptor();
+      IConstraint constraint = getConstraint();
+      // String name = constraint.getId();
+      // if (name != null) {
+      // retval.setName(name);
+      // }
+
+      String id = constraint.getId();
+      if (id != null) {
+        retval.setId(id);
+      }
+      retval.setGuid(getGuid());
+      String formalName = constraint.getFormalName();
+      if (formalName != null) {
+        MultiformatMessageString text = new MultiformatMessageString();
+        text.setText(formalName);
+        retval.setShortDescription(text);
+      }
+      MarkupLine description = constraint.getDescription();
+      if (description != null) {
+        MultiformatMessageString text = new MultiformatMessageString();
+        text.setMarkdown(description.toMarkdown());
+        retval.setFullDescription(text);
+      }
+      return retval;
+    }
+
+  }
+
+  private class ArtifactRecord {
+    private final URI uri;
+    private final int index;
+
+    public ArtifactRecord(@NonNull URI uri) {
+      this.uri = uri;
+      this.index = artifactIndex.addAndGet(1);
+    }
+
+    @NonNull
+    public URI getUri() {
+      return uri;
+    }
+
+    public int getIndex() {
+      return index;
+    }
+
+    public ArtifactLocation generateArtifactLocation(@NonNull URI baseUri) throws IOException {
+      ArtifactLocation location = new ArtifactLocation();
+      location.setUri(relativize(baseUri, getUri()));
+      location.setIndex(BigInteger.valueOf(getIndex()));
+      return location;
+    }
+  }
+}
diff --git a/databind-metaschema/src/main/metaschema-bindings/metaschema-metaschema-bindings.xml b/databind-metaschema/src/main/metaschema-bindings/metaschema-metaschema-bindings.xml
index 94a960680..580b79e35 100644
--- a/databind-metaschema/src/main/metaschema-bindings/metaschema-metaschema-bindings.xml
+++ b/databind-metaschema/src/main/metaschema-bindings/metaschema-metaschema-bindings.xml
@@ -3,7 +3,55 @@
 	xmlns="https://csrc.nist.gov/ns/metaschema-binding/1.0">
 	<model-binding namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
 		<java>
-			<use-package-name>gov.nist.secauto.metaschema.databind.metaschema</use-package-name>
+			<use-package-name>gov.nist.secauto.metaschema.databind.binding.metaschema</use-package-name>
 		</java>
 	</model-binding>
+	<metaschema-binding
+		href="../../../../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml">
+		<define-assembly-binding name="group-as">
+			<java>
+				<use-class-name>GroupingAs</use-class-name>
+			</java>
+		</define-assembly-binding>
+		<define-assembly-binding name="assembly-constraints">
+			<java>
+				<implement-interface>gov.nist.secauto.metaschema.databind.model.metaschema.IModelConstraintsBase</implement-interface>
+			</java>
+		</define-assembly-binding>
+		<define-assembly-binding name="constraint-value-enum">
+			<java>
+				<extend-base-class>gov.nist.secauto.metaschema.databind.model.metaschema.impl.AbstractAllowedValue</extend-base-class>
+			</java>
+		</define-assembly-binding>
+		<define-assembly-binding name="field-constraints">
+			<java>
+				<implement-interface>gov.nist.secauto.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase</implement-interface>
+			</java>
+		</define-assembly-binding>
+		<define-assembly-binding name="flag-allowed-values">
+			<java>
+				<implement-interface>gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase</implement-interface>
+			</java>
+		</define-assembly-binding>
+		<define-assembly-binding name="flag-constraints">
+			<java>
+				<implement-interface>gov.nist.secauto.metaschema.databind.model.metaschema.IValueConstraintsBase</implement-interface>
+			</java>
+		</define-assembly-binding>
+		<define-assembly-binding name="flag-expect">
+			<java>
+				<implement-interface>gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase</implement-interface>
+			</java>
+		</define-assembly-binding>
+		<define-assembly-binding name="flag-index-has-key">
+			<java>
+				<implement-interface>gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase</implement-interface>
+			</java>
+		</define-assembly-binding>
+		<define-assembly-binding name="flag-matches">
+			<java>
+				<implement-interface>gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase</implement-interface>
+			</java>
+		</define-assembly-binding>
+	</metaschema-binding>
 </metaschema-bindings>
diff --git a/databind-metaschema/src/main/metaschema-bindings/sarif-module-bindings.xml b/databind-metaschema/src/main/metaschema-bindings/sarif-module-bindings.xml
new file mode 100644
index 000000000..4d2a5ceda
--- /dev/null
+++ b/databind-metaschema/src/main/metaschema-bindings/sarif-module-bindings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metaschema-bindings
+	xmlns="https://csrc.nist.gov/ns/metaschema-binding/1.0">
+	<model-binding namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
+		<java>
+			<use-package-name>gov.nist.secauto.metaschema.databind.binding.sarif</use-package-name>
+		</java>
+	</model-binding>
+</metaschema-bindings>
diff --git a/databind/pom.xml b/databind/pom.xml
index 521f024a2..fdef326d9 100644
--- a/databind/pom.xml
+++ b/databind/pom.xml
@@ -1,183 +1,189 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>gov.nist.secauto.metaschema</groupId>
-		<artifactId>metaschema-framework</artifactId>
-		<version>1.0.0-M2-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>metaschema-databind</artifactId>
-	<packaging>jar</packaging>
-
-	<name>Metaschema Java Data/Object Binding and Code Generation</name>
-	<description>A Metaschema binding-based parser and code generator for Java
-		objects supporting serialization of conformant XML, JSON, and YAML data.</description>
-
-	<url>${site.url}${project.artifactId}/</url>
-	<distributionManagement>
-		<site>
-			<id>nist-pages</id>
-			<url>${site.url}${project.artifactId}/</url>
-		</site>
-	</distributionManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>metaschema-core</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.auto.service</groupId>
-			<artifactId>auto-service-annotations</artifactId>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>nl.talsmasoftware</groupId>
-			<artifactId>lazy4j</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.squareup</groupId>
-			<artifactId>javapoet</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.github.erosb</groupId>
-			<artifactId>everit-json-schema</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.dataformat</groupId>
-			<artifactId>jackson-dataformat-xml</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.dataformat</groupId>
-			<artifactId>jackson-dataformat-yaml</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.xmlbeans</groupId>
-			<artifactId>xmlbeans</artifactId>
-		</dependency>
-
-		<!-- Log4j API and Core implementation required for binding -->
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jmock</groupId>
-			<artifactId>jmock-junit5</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-pmd-plugin</artifactId>
-					<configuration>
-						<excludeRoots>
-							<excludeRoot>target/generated-sources/xmlbeans</excludeRoot>
-						</excludeRoots>
-						<excludes>
-                            <exclude>**/gov/nist/secauto/metaschema/databind/model/metaschema/*.java</exclude>
-                        </excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-checkstyle-plugin</artifactId>
-					<configuration>
-						<excludes>**/gov/nist/secauto/metaschema/databind/model/metaschema/*.java,**/gov/nist/secauto/metaschema/databind/model/test/*.java</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<configuration>
-						<excludes>
-							<exclude>gov/nist/secauto/metaschema/databind/codegen/xmlbeans/**/*</exclude>
-							<exclude>org/apache/xmlbeans/**/*</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>gov.nist.secauto</groupId>
-				<artifactId>oss-build-support</artifactId>
-				<executions>
-					<execution>
-						<id>metaschema-codegen-beans</id>
-						<inherited>false</inherited>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate-xmlbeans</goal>
-						</goals>
-						<configuration>
-							<xmlConfigs>
-								${project.basedir}/src/schema/xmlconfig.xml</xmlConfigs>
-							<sourceDir>${project.basedir}/src/main/xsd</sourceDir>
-							<javaTargetDir>
-								${project.build.directory}/generated-sources/xmlbeans</javaTargetDir>
-							<classTargetDir>
-								${project.basedir}/target/generated-resources/xmlbeans</classTargetDir>
-							<name>metaschema.codegen</name>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>
-									${project.build.directory}/generated-sources/xmlbeans</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<configuration>
-					<usedDependencies>
-						<usedDependency>com.sun.xml.bind:jaxb-impl</usedDependency>
-						<usedDependency>org.apache.logging.log4j:log4j-core</usedDependency>
-					</usedDependencies>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>gov.nist.secauto.metaschema</groupId>
+		<artifactId>metaschema-framework</artifactId>
+		<version>1.0.0-M2-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>metaschema-databind</artifactId>
+	<packaging>jar</packaging>
+
+	<name>Metaschema Java Data Binding and Code Generation</name>
+	<description>A Metaschema binding-based parser and code generator for Java
+		objects supporting serialization of conformant XML, JSON, and YAML data.</description>
+
+	<url>${site.url}${project.artifactId}/</url>
+	<distributionManagement>
+		<site>
+			<id>nist-pages</id>
+			<url>${site.url}${project.artifactId}/</url>
+		</site>
+	</distributionManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>metaschema-core</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.auto.service</groupId>
+			<artifactId>auto-service-annotations</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>nl.talsmasoftware</groupId>
+			<artifactId>lazy4j</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.squareup</groupId>
+			<artifactId>javapoet</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.github.erosb</groupId>
+			<artifactId>everit-json-schema</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-xml</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.xmlbeans</groupId>
+			<artifactId>xmlbeans</artifactId>
+		</dependency>
+
+		<!-- Log4j API and Core implementation required for binding -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jmock</groupId>
+			<artifactId>jmock-junit5</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+		    <groupId>org.eclipse.jdt</groupId>
+		    <artifactId>org.eclipse.jdt.annotation</artifactId>
+		</dependency>
+	</dependencies>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-pmd-plugin</artifactId>
+					<configuration>
+						<excludeRoots>
+							<excludeRoot>target/generated-sources/xmlbeans</excludeRoot>
+						</excludeRoots>
+						<excludes>
+                            <exclude>gov/nist/secauto/metaschema/databind/model/binding/metaschema/*.java</exclude>
+                        </excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-checkstyle-plugin</artifactId>
+					<configuration>
+						<excludes>**/gov/nist/secauto/metaschema/databind/model/binding/metaschema/*.java,**/gov/nist/secauto/metaschema/databind/model/test/*.java</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<configuration>
+						<excludes>
+							<!-- filter generated code -->
+							<exclude>gov/nist/secauto/metaschema/databind/codegen/xmlbeans/**/*</exclude>
+							<exclude>org/apache/xmlbeans/**/*</exclude>
+							<exclude>gov/nist/secauto/metaschema/databind/model/binding/metaschema/*</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>gov.nist.secauto</groupId>
+				<artifactId>oss-build-support</artifactId>
+				<executions>
+					<execution>
+						<id>metaschema-codegen-beans</id>
+						<inherited>false</inherited>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate-xmlbeans</goal>
+						</goals>
+						<configuration>
+							<xmlConfigs>
+								${project.basedir}/src/schema/xmlconfig.xml</xmlConfigs>
+							<sourceDir>${project.basedir}/src/main/xsd</sourceDir>
+							<javaTargetDir>
+								${project.build.directory}/generated-sources/xmlbeans</javaTargetDir>
+							<classTargetDir>
+								${project.basedir}/target/generated-resources/xmlbeans</classTargetDir>
+							<name>metaschema.codegen</name>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>
+									${project.build.directory}/generated-sources/xmlbeans</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<configuration>
+					<usedDependencies>
+						<usedDependency>com.sun.xml.bind:jaxb-impl</usedDependency>
+						<usedDependency>org.apache.logging.log4j:log4j-core</usedDependency>
+					</usedDependencies>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/DefaultBindingContext.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/DefaultBindingContext.java
index aafb556b6..e052ebcba 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/DefaultBindingContext.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/DefaultBindingContext.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.datatype.DataTypeService;
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.core.model.IModuleLoader;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -44,7 +45,6 @@
 import gov.nist.secauto.metaschema.databind.io.xml.DefaultXmlSerializer;
 import gov.nist.secauto.metaschema.databind.io.yaml.DefaultYamlDeserializer;
 import gov.nist.secauto.metaschema.databind.io.yaml.DefaultYamlSerializer;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundModule;
@@ -138,12 +138,12 @@ protected Collection<IBindingMatcher> getBindingMatchers() {
 
   @Override
   @NonNull
-  public IBindingMatcher registerBindingMatcher(@NonNull IBoundDefinitionModelAssembly definition) {
-    return ObjectUtils.notNull(bindingMatchers.computeIfAbsent(definition, (key) -> IBindingMatcher.of(definition)));
+  public final IBindingMatcher registerBindingMatcher(@NonNull IBoundDefinitionModelAssembly definition) {
+    return ObjectUtils.notNull(bindingMatchers.computeIfAbsent(definition, key -> IBindingMatcher.of(definition)));
   }
 
   @Override
-  public IBindingMatcher registerBindingMatcher(@NonNull Class<?> clazz) {
+  public final IBindingMatcher registerBindingMatcher(@NonNull Class<? extends IBoundObject> clazz) {
     IBoundDefinitionModelComplex definition = getBoundDefinitionForClass(clazz);
     if (definition == null) {
       throw new IllegalArgumentException(String.format("Unable to find bound definition for class '%s'.",
@@ -160,13 +160,13 @@ public IBindingMatcher registerBindingMatcher(@NonNull Class<?> clazz) {
   }
 
   @Override
-  public IBoundDefinitionModelComplex registerClassBinding(IBoundDefinitionModelComplex definition) {
+  public final IBoundDefinitionModelComplex registerClassBinding(IBoundDefinitionModelComplex definition) {
     Class<?> clazz = definition.getBoundClass();
     return boundClassToStrategyMap.computeIfAbsent(clazz, k -> definition);
   }
 
   @Override
-  public IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<?> clazz) {
+  public IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<? extends IBoundObject> clazz) {
     return moduleLoaderStrategy.getBoundDefinitionForClass(clazz);
   }
 
@@ -181,7 +181,9 @@ public <TYPE extends IDataTypeAdapter<?>> TYPE getJavaTypeAdapterInstance(@NonNu
    * A serializer returned by this method is thread-safe.
    */
   @Override
-  public <CLASS> ISerializer<CLASS> newSerializer(@NonNull Format format, @NonNull Class<CLASS> clazz) {
+  public <CLASS extends IBoundObject> ISerializer<CLASS> newSerializer(
+      @NonNull Format format,
+      @NonNull Class<CLASS> clazz) {
     Objects.requireNonNull(format, "format");
     IBoundDefinitionModelAssembly definition;
     try {
@@ -216,7 +218,9 @@ public <CLASS> ISerializer<CLASS> newSerializer(@NonNull Format format, @NonNull
    * A deserializer returned by this method is thread-safe.
    */
   @Override
-  public <CLASS> IDeserializer<CLASS> newDeserializer(@NonNull Format format, @NonNull Class<CLASS> clazz) {
+  public <CLASS extends IBoundObject> IDeserializer<CLASS> newDeserializer(
+      @NonNull Format format,
+      @NonNull Class<CLASS> clazz) {
     IBoundDefinitionModelAssembly definition;
     try {
       definition = IBoundDefinitionModelAssembly.class.cast(getBoundDefinitionForClass(clazz));
@@ -288,8 +292,8 @@ public IBoundModule registerModule(Class<? extends IBoundModule> clazz) {
   }
 
   @Override
-  public Class<?> getBoundClassForRootXmlQName(@NonNull QName rootQName) {
-    Class<?> retval = null;
+  public Class<? extends IBoundObject> getBoundClassForRootXmlQName(@NonNull QName rootQName) {
+    Class<? extends IBoundObject> retval = null;
     for (IBindingMatcher matcher : getBindingMatchers()) {
       retval = matcher.getBoundClassForXmlQName(rootQName);
       if (retval != null) {
@@ -300,8 +304,8 @@ public Class<?> getBoundClassForRootXmlQName(@NonNull QName rootQName) {
   }
 
   @Override
-  public Class<?> getBoundClassForRootJsonName(@NonNull String rootName) {
-    Class<?> retval = null;
+  public Class<? extends IBoundObject> getBoundClassForRootJsonName(@NonNull String rootName) {
+    Class<? extends IBoundObject> retval = null;
     for (IBindingMatcher matcher : getBindingMatchers()) {
       retval = matcher.getBoundClassForJsonName(rootName);
       if (retval != null) {
@@ -317,12 +321,12 @@ public DefaultBoundLoader newBoundLoader() {
   }
 
   @Override
-  public <CLASS> CLASS deepCopy(@NonNull CLASS other, Object parentInstance) throws BindingException {
-    IBoundDefinitionModel definition = getBoundDefinitionForClass(other.getClass());
+  public <CLASS extends IBoundObject> CLASS deepCopy(@NonNull CLASS other, IBoundObject parentInstance)
+      throws BindingException {
+    IBoundDefinitionModelComplex definition = getBoundDefinitionForClass(other.getClass());
     if (definition == null) {
       throw new IllegalStateException(String.format("Class '%s' is not bound", other.getClass().getName()));
     }
-    @SuppressWarnings("unchecked") CLASS retval = (CLASS) definition.deepCopyItem(other, parentInstance);
-    return retval;
+    return ObjectUtils.asType(definition.deepCopyItem(other, parentInstance));
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/IBindingContext.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/IBindingContext.java
index 84c6bfb00..22026d483 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/IBindingContext.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/IBindingContext.java
@@ -1,491 +1,554 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind;
-
-import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
-import gov.nist.secauto.metaschema.core.metapath.StaticContext;
-import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
-import gov.nist.secauto.metaschema.core.model.IModule;
-import gov.nist.secauto.metaschema.core.model.constraint.DefaultConstraintValidator;
-import gov.nist.secauto.metaschema.core.model.constraint.FindingCollectingConstraintValidationHandler;
-import gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidationHandler;
-import gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidator;
-import gov.nist.secauto.metaschema.core.model.validation.AggregateValidationResult;
-import gov.nist.secauto.metaschema.core.model.validation.IValidationResult;
-import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator;
-import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-import gov.nist.secauto.metaschema.databind.io.BindingException;
-import gov.nist.secauto.metaschema.databind.io.DeserializationFeature;
-import gov.nist.secauto.metaschema.databind.io.Format;
-import gov.nist.secauto.metaschema.databind.io.IBoundLoader;
-import gov.nist.secauto.metaschema.databind.io.IDeserializer;
-import gov.nist.secauto.metaschema.databind.io.ISerializer;
-import gov.nist.secauto.metaschema.databind.io.yaml.YamlOperations;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
-import gov.nist.secauto.metaschema.databind.model.IBoundModule;
-import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
-import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField;
-
-import org.json.JSONObject;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.net.URI;
-import java.nio.file.Path;
-import java.time.ZonedDateTime;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
-/**
- * Provides information supporting a binding between a set of Module models and
- * corresponding Java classes.
- */
-public interface IBindingContext {
-
-  /**
-   * Get the singleton {@link IBindingContext} instance, which can be used to load
-   * information that binds a model to a set of Java classes.
-   *
-   * @return a new binding context
-   */
-  @NonNull
-  static IBindingContext instance() {
-    return DefaultBindingContext.instance();
-  }
-
-  /**
-   * Register a matcher used to identify a bound class by the definition's root
-   * name.
-   *
-   * @param definition
-   *          the definition to match for
-   * @return the matcher
-   */
-  @NonNull
-  IBindingMatcher registerBindingMatcher(@NonNull IBoundDefinitionModelAssembly definition);
-
-  /**
-   * Register a matcher used to identify a bound class by the definition's root
-   * name.
-   *
-   * @param clazz
-   *          the definition class to match for, which must represent a root
-   *          assembly definition
-   * @return the matcher
-   */
-  @NonNull
-  IBindingMatcher registerBindingMatcher(@NonNull Class<?> clazz);
-
-  /**
-   * Register a class binding for a given bound class.
-   *
-   * @param definition
-   *          the bound class information to register
-   * @return the old bound class information or {@code null} if no binding existed
-   *         for the associated class
-   */
-  @Nullable
-  IBoundDefinitionModelComplex registerClassBinding(@NonNull IBoundDefinitionModelComplex definition);
-
-  /**
-   * Get the {@link IBoundDefinitionModel} instance associated with the provided
-   * Java class.
-   * <p>
-   * Typically the class will have a {@link MetaschemaAssembly} or
-   * {@link MetaschemaField} annotation.
-   *
-   * @param clazz
-   *          the class binding to load
-   * @return the associated class binding instance or {@code null} if the class is
-   *         not bound
-   */
-  @Nullable
-  IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<?> clazz);
-
-  /**
-   * Determine the bound class for the provided XML {@link QName}.
-   *
-   * @param rootQName
-   *          the root XML element's QName
-   * @return the bound class or {@code null} if not recognized
-   * @see IBindingContext#registerBindingMatcher(Class)
-   */
-  @Nullable
-  Class<?> getBoundClassForRootXmlQName(@NonNull QName rootQName);
-
-  /**
-   * Determine the bound class for the provided JSON/YAML property/item name using
-   * any registered matchers.
-   *
-   * @param rootName
-   *          the JSON/YAML property/item name
-   * @return the bound class or {@code null} if not recognized
-   * @see IBindingContext#registerBindingMatcher(Class)
-   */
-  @Nullable
-  Class<?> getBoundClassForRootJsonName(@NonNull String rootName);
-
-  /**
-   * Get's the {@link IDataTypeAdapter} associated with the specified Java class,
-   * which is used to read and write XML, JSON, and YAML data to and from
-   * instances of that class. Thus, this adapter supports a direct binding between
-   * the Java class and structured data in one of the supported formats. Adapters
-   * are used to support bindings for simple data objects (e.g., {@link String},
-   * {@link BigInteger}, {@link ZonedDateTime}, etc).
-   *
-   * @param <TYPE>
-   *          the class type of the adapter
-   * @param clazz
-   *          the Java {@link Class} for the bound type
-   * @return the adapter instance or {@code null} if the provided class is not
-   *         bound
-   */
-  @Nullable
-  <TYPE extends IDataTypeAdapter<?>> TYPE getJavaTypeAdapterInstance(@NonNull Class<TYPE> clazz);
-
-  /**
-   * Load a bound Metaschema module implemented by the provided class.
-   * <p>
-   * Also registers any associated bound classes.
-   * <p>
-   * Implementations are expected to return the same IModule instance for multiple
-   * calls to this method with the same class argument.
-   *
-   * @param clazz
-   *          the class implementing a bound Metaschema module
-   * @return the loaded module
-   */
-  @NonNull
-  IBoundModule registerModule(@NonNull Class<? extends IBoundModule> clazz);
-
-  /**
-   * Generate, compile, and load a set of generated Module annotated Java classes
-   * based on the provided Module {@code module}.
-   *
-   * @param module
-   *          the Module module to generate classes for
-   * @param compilePath
-   *          the path to the directory to generate classes in
-   * @return this instance
-   * @throws IOException
-   *           if an error occurred while generating or loading the classes
-   */
-  @NonNull
-  IBindingContext registerModule(
-      @NonNull IModule module,
-      @NonNull Path compilePath) throws IOException;
-
-  /**
-   * Gets a data {@link ISerializer} which can be used to write Java instance data
-   * for the provided class in the requested format.
-   * <p>
-   * The provided class must be a bound Java class with a
-   * {@link MetaschemaAssembly} or {@link MetaschemaField} annotation for which a
-   * {@link IBoundDefinitionModel} exists.
-   *
-   * @param <CLASS>
-   *          the Java type this serializer can write data from
-   * @param format
-   *          the format to serialize into
-   * @param clazz
-   *          the Java data object to serialize
-   * @return the serializer instance
-   * @throws NullPointerException
-   *           if any of the provided arguments, except the configuration, are
-   *           {@code null}
-   * @throws IllegalArgumentException
-   *           if the provided class is not bound to a Module assembly or field
-   * @throws UnsupportedOperationException
-   *           if the requested format is not supported by the implementation
-   * @see #getBoundDefinitionForClass(Class)
-   */
-  @NonNull
-  <CLASS> ISerializer<CLASS> newSerializer(@NonNull Format format, @NonNull Class<CLASS> clazz);
-
-  /**
-   * Gets a data {@link IDeserializer} which can be used to read Java instance
-   * data for the provided class from the requested format.
-   * <p>
-   * The provided class must be a bound Java class with a
-   * {@link MetaschemaAssembly} or {@link MetaschemaField} annotation for which a
-   * {@link IBoundDefinitionModel} exists.
-   *
-   * @param <CLASS>
-   *          the Java type this deserializer can read data into
-   * @param format
-   *          the format to serialize into
-   * @param clazz
-   *          the Java data type to serialize
-   * @return the deserializer instance
-   * @throws NullPointerException
-   *           if any of the provided arguments, except the configuration, are
-   *           {@code null}
-   * @throws IllegalArgumentException
-   *           if the provided class is not bound to a Module assembly or field
-   * @throws UnsupportedOperationException
-   *           if the requested format is not supported by the implementation
-   * @see #getBoundDefinitionForClass(Class)
-   */
-  @NonNull
-  <CLASS> IDeserializer<CLASS> newDeserializer(@NonNull Format format, @NonNull Class<CLASS> clazz);
-
-  /**
-   * Get a new {@link IBoundLoader} instance.
-   *
-   * @return the instance
-   */
-  @NonNull
-  IBoundLoader newBoundLoader();
-
-  /**
-   * Create a deep copy of the provided bound object.
-   *
-   * @param <CLASS>
-   *          the bound object type
-   * @param other
-   *          the object to copy
-   * @param parentInstance
-   *          the object's parent or {@code null}
-   * @return a deep copy of the provided object
-   * @throws BindingException
-   *           if an error occurred copying content between java instances
-   * @throws NullPointerException
-   *           if the provided object is {@code null}
-   * @throws IllegalArgumentException
-   *           if the provided class is not bound to a Module assembly or field
-   */
-  @NonNull
-  <CLASS> CLASS deepCopy(@NonNull CLASS other, Object parentInstance) throws BindingException;
-
-  /**
-   * Get a new single use constraint validator.
-   *
-   * @param handler
-   *          the validation handler to use to process the validation results
-   *
-   * @return the validator
-   */
-  default IConstraintValidator newValidator(@NonNull IConstraintValidationHandler handler) {
-    IBoundLoader loader = newBoundLoader();
-    loader.disableFeature(DeserializationFeature.DESERIALIZE_VALIDATE_CONSTRAINTS);
-
-    DynamicContext context = StaticContext.instance().dynamicContext();
-    context.setDocumentLoader(loader);
-
-    return new DefaultConstraintValidator(handler);
-  }
-
-  /**
-   * Perform constraint validation on the provided bound object represented as an
-   * {@link INodeItem}.
-   *
-   * @param nodeItem
-   *          the node item to validate
-   * @return the validation result
-   * @throws IllegalArgumentException
-   *           if the provided class is not bound to a Module assembly or field
-   */
-  default IValidationResult validate(@NonNull INodeItem nodeItem) {
-    FindingCollectingConstraintValidationHandler handler = new FindingCollectingConstraintValidationHandler();
-    IConstraintValidator validator = newValidator(handler);
-    DynamicContext dynamicContext = StaticContext.instance().dynamicContext();
-    dynamicContext.setDocumentLoader(newBoundLoader());
-    validator.validate(nodeItem, dynamicContext);
-    validator.finalizeValidation(dynamicContext);
-    return handler;
-  }
-
-  /**
-   * Load and perform schema and constraint validation on the target. The
-   * constraint validation will only be performed if the schema validation passes.
-   *
-   * @param target
-   *          the target to validate
-   * @param asFormat
-   *          the schema format to use to validate the target
-   * @param schemaProvider
-   *          provides callbacks to get the appropriate schemas
-   * @return the validation result
-   * @throws IOException
-   *           if an error occurred while reading the target
-   * @throws SAXException
-   *           if an error occurred when parsing the target as XML
-   */
-  default IValidationResult validate(
-      @NonNull URI target,
-      @NonNull Format asFormat,
-      @NonNull IValidationSchemaProvider schemaProvider) throws IOException, SAXException {
-    IValidationResult retval;
-    switch (asFormat) {
-    case JSON:
-      retval = new JsonSchemaContentValidator(schemaProvider.getJsonSchema()).validate(target);
-      break;
-    case XML:
-      List<Source> schemaSources = schemaProvider.getXmlSchemas();
-      retval = new XmlSchemaContentValidator(schemaSources).validate(target);
-      break;
-    case YAML:
-      JSONObject json = YamlOperations.yamlToJson(YamlOperations.parseYaml(target));
-      assert json != null;
-      retval = new JsonSchemaContentValidator(schemaProvider.getJsonSchema())
-          .validate(json, ObjectUtils.notNull(target));
-      break;
-    default:
-      throw new UnsupportedOperationException("Unsupported format: " + asFormat.name());
-    }
-
-    if (retval.isPassing()) {
-      IValidationResult constraintValidationResult = validateWithConstraints(target);
-      retval = AggregateValidationResult.aggregate(retval, constraintValidationResult);
-    }
-    return retval;
-  }
-
-  /**
-   * Load and validate the provided {@code target} using the associated Module
-   * module constraints.
-   *
-   * @param target
-   *          the file to load and validate
-   * @return the validation results
-   * @throws IOException
-   *           if an error occurred while loading the document
-   */
-  default IValidationResult validateWithConstraints(@NonNull URI target) throws IOException {
-    IBoundLoader loader = newBoundLoader();
-    loader.disableFeature(DeserializationFeature.DESERIALIZE_VALIDATE_CONSTRAINTS);
-
-    DynamicContext dynamicContext = StaticContext.instance().dynamicContext();
-    dynamicContext.setDocumentLoader(loader);
-    IDocumentNodeItem nodeItem = loader.loadAsNodeItem(target);
-
-    return validate(nodeItem);
-  }
-
-  interface IModuleLoaderStrategy {
-    /**
-     * Load the bound Metaschema module represented by the provided class.
-     * <p>
-     * Implementations are allowed to return a cached instance if the module has
-     * already been loaded.
-     *
-     * @param clazz
-     *          the Module class
-     * @return the module
-     * @throws IllegalStateException
-     *           if an error occurred while processing the associated module
-     *           information
-     */
-    @NonNull
-    IBoundModule loadModule(@NonNull Class<? extends IBoundModule> clazz);
-
-    /**
-     * Get the {@link IBoundDefinitionModel} instance associated with the provided
-     * Java class.
-     * <p>
-     * Typically the class will have a {@link MetaschemaAssembly} or
-     * {@link MetaschemaField} annotation.
-     *
-     * @param clazz
-     *          the class binding to load
-     * @return the associated class binding instance or {@code null} if the class is
-     *         not bound
-     */
-    @Nullable
-    IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<?> clazz);
-  }
-
-  interface IValidationSchemaProvider {
-    /**
-     * Get a JSON schema to use for content validation.
-     *
-     * @return the JSON schema
-     * @throws IOException
-     *           if an error occurred while loading the schema
-     */
-    @NonNull
-    JSONObject getJsonSchema() throws IOException;
-
-    /**
-     * Get a XML schema to use for content validation.
-     *
-     * @return the XML schema sources
-     * @throws IOException
-     *           if an error occurred while loading the schema
-     */
-    @NonNull
-    List<Source> getXmlSchemas() throws IOException;
-  }
-
-  /**
-   * Implementations of this interface provide a means by which a bound class can
-   * be found that corresponds to an XML element, JSON property, or YAML item
-   * name.
-   */
-  interface IBindingMatcher {
-    @SuppressWarnings("PMD.ShortMethodName")
-    @NonNull
-    static IBindingMatcher of(IBoundDefinitionModelAssembly assembly) {
-      if (!assembly.isRoot()) {
-        throw new IllegalArgumentException(
-            String.format("The provided class '%s' is not a root assembly.", assembly.getBoundClass().getName()));
-      }
-      return new RootAssemblyBindingMatcher(assembly);
-    }
-
-    /**
-     * Determine the bound class for the provided XML {@link QName}.
-     *
-     * @param rootQName
-     *          the root XML element's QName
-     * @return the bound class for the XML qualified name or {@code null} if not
-     *         recognized
-     */
-    Class<?> getBoundClassForXmlQName(QName rootQName);
-
-    /**
-     * Determine the bound class for the provided JSON/YAML property/item name.
-     *
-     * @param rootName
-     *          the JSON/YAML property/item name
-     * @return the bound class for the JSON property name or {@code null} if not
-     *         recognized
-     */
-    Class<?> getBoundClassForJsonName(String rootName);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind;
+
+import gov.nist.secauto.metaschema.core.configuration.IConfiguration;
+import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
+import gov.nist.secauto.metaschema.core.metapath.StaticContext;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
+import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IModule;
+import gov.nist.secauto.metaschema.core.model.constraint.DefaultConstraintValidator;
+import gov.nist.secauto.metaschema.core.model.constraint.FindingCollectingConstraintValidationHandler;
+import gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidationHandler;
+import gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidator;
+import gov.nist.secauto.metaschema.core.model.constraint.ValidationFeature;
+import gov.nist.secauto.metaschema.core.model.validation.AggregateValidationResult;
+import gov.nist.secauto.metaschema.core.model.validation.IValidationResult;
+import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator;
+import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+import gov.nist.secauto.metaschema.databind.io.BindingException;
+import gov.nist.secauto.metaschema.databind.io.DeserializationFeature;
+import gov.nist.secauto.metaschema.databind.io.Format;
+import gov.nist.secauto.metaschema.databind.io.IBoundLoader;
+import gov.nist.secauto.metaschema.databind.io.IDeserializer;
+import gov.nist.secauto.metaschema.databind.io.ISerializer;
+import gov.nist.secauto.metaschema.databind.io.yaml.YamlOperations;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
+import gov.nist.secauto.metaschema.databind.model.IBoundModule;
+import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
+import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField;
+
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.xml.sax.SAXException;
+
+import java.io.BufferedInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.net.URI;
+import java.net.URL;
+import java.nio.file.Path;
+import java.time.ZonedDateTime;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+/**
+ * Provides information supporting a binding between a set of Module models and
+ * corresponding Java classes.
+ */
+public interface IBindingContext {
+
+  /**
+   * Get the singleton {@link IBindingContext} instance, which can be used to load
+   * information that binds a model to a set of Java classes.
+   *
+   * @return a new binding context
+   */
+  @NonNull
+  static IBindingContext instance() {
+    return DefaultBindingContext.instance();
+  }
+
+  /**
+   * Register a matcher used to identify a bound class by the definition's root
+   * name.
+   *
+   * @param definition
+   *          the definition to match for
+   * @return the matcher
+   */
+  @NonNull
+  IBindingMatcher registerBindingMatcher(@NonNull IBoundDefinitionModelAssembly definition);
+
+  /**
+   * Register a matcher used to identify a bound class by the definition's root
+   * name.
+   *
+   * @param clazz
+   *          the definition class to match for, which must represent a root
+   *          assembly definition
+   * @return the matcher
+   */
+  @NonNull
+  IBindingMatcher registerBindingMatcher(@NonNull Class<? extends IBoundObject> clazz);
+
+  /**
+   * Register a class binding for a given bound class.
+   *
+   * @param definition
+   *          the bound class information to register
+   * @return the old bound class information or {@code null} if no binding existed
+   *         for the associated class
+   */
+  @Nullable
+  IBoundDefinitionModelComplex registerClassBinding(@NonNull IBoundDefinitionModelComplex definition);
+
+  /**
+   * Get the {@link IBoundDefinitionModel} instance associated with the provided
+   * Java class.
+   * <p>
+   * Typically the class will have a {@link MetaschemaAssembly} or
+   * {@link MetaschemaField} annotation.
+   *
+   * @param clazz
+   *          the class binding to load
+   * @return the associated class binding instance or {@code null} if the class is
+   *         not bound
+   */
+  @Nullable
+  IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<? extends IBoundObject> clazz);
+
+  /**
+   * Determine the bound class for the provided XML {@link QName}.
+   *
+   * @param rootQName
+   *          the root XML element's QName
+   * @return the bound class or {@code null} if not recognized
+   * @see IBindingContext#registerBindingMatcher(Class)
+   */
+  @Nullable
+  Class<? extends IBoundObject> getBoundClassForRootXmlQName(@NonNull QName rootQName);
+
+  /**
+   * Determine the bound class for the provided JSON/YAML property/item name using
+   * any registered matchers.
+   *
+   * @param rootName
+   *          the JSON/YAML property/item name
+   * @return the bound class or {@code null} if not recognized
+   * @see IBindingContext#registerBindingMatcher(Class)
+   */
+  @Nullable
+  Class<? extends IBoundObject> getBoundClassForRootJsonName(@NonNull String rootName);
+
+  /**
+   * Get's the {@link IDataTypeAdapter} associated with the specified Java class,
+   * which is used to read and write XML, JSON, and YAML data to and from
+   * instances of that class. Thus, this adapter supports a direct binding between
+   * the Java class and structured data in one of the supported formats. Adapters
+   * are used to support bindings for simple data objects (e.g., {@link String},
+   * {@link BigInteger}, {@link ZonedDateTime}, etc).
+   *
+   * @param <TYPE>
+   *          the class type of the adapter
+   * @param clazz
+   *          the Java {@link Class} for the bound type
+   * @return the adapter instance or {@code null} if the provided class is not
+   *         bound
+   */
+  @Nullable
+  <TYPE extends IDataTypeAdapter<?>> TYPE getJavaTypeAdapterInstance(@NonNull Class<TYPE> clazz);
+
+  /**
+   * Load a bound Metaschema module implemented by the provided class.
+   * <p>
+   * Also registers any associated bound classes.
+   * <p>
+   * Implementations are expected to return the same IModule instance for multiple
+   * calls to this method with the same class argument.
+   *
+   * @param clazz
+   *          the class implementing a bound Metaschema module
+   * @return the loaded module
+   */
+  @NonNull
+  IBoundModule registerModule(@NonNull Class<? extends IBoundModule> clazz);
+
+  /**
+   * Generate, compile, and load a set of generated Module annotated Java classes
+   * based on the provided Module {@code module}.
+   *
+   * @param module
+   *          the Module module to generate classes for
+   * @param compilePath
+   *          the path to the directory to generate classes in
+   * @return this instance
+   * @throws IOException
+   *           if an error occurred while generating or loading the classes
+   */
+  @NonNull
+  IBindingContext registerModule(
+      @NonNull IModule module,
+      @NonNull Path compilePath) throws IOException;
+
+  /**
+   * Gets a data {@link ISerializer} which can be used to write Java instance data
+   * for the provided class in the requested format.
+   * <p>
+   * The provided class must be a bound Java class with a
+   * {@link MetaschemaAssembly} or {@link MetaschemaField} annotation for which a
+   * {@link IBoundDefinitionModel} exists.
+   *
+   * @param <CLASS>
+   *          the Java type this serializer can write data from
+   * @param format
+   *          the format to serialize into
+   * @param clazz
+   *          the Java data object to serialize
+   * @return the serializer instance
+   * @throws NullPointerException
+   *           if any of the provided arguments, except the configuration, are
+   *           {@code null}
+   * @throws IllegalArgumentException
+   *           if the provided class is not bound to a Module assembly or field
+   * @throws UnsupportedOperationException
+   *           if the requested format is not supported by the implementation
+   * @see #getBoundDefinitionForClass(Class)
+   */
+  @NonNull
+  <CLASS extends IBoundObject> ISerializer<CLASS> newSerializer(
+      @NonNull Format format,
+      @NonNull Class<CLASS> clazz);
+
+  /**
+   * Gets a data {@link IDeserializer} which can be used to read Java instance
+   * data for the provided class from the requested format.
+   * <p>
+   * The provided class must be a bound Java class with a
+   * {@link MetaschemaAssembly} or {@link MetaschemaField} annotation for which a
+   * {@link IBoundDefinitionModel} exists.
+   *
+   * @param <CLASS>
+   *          the Java type this deserializer can read data into
+   * @param format
+   *          the format to serialize into
+   * @param clazz
+   *          the Java data type to serialize
+   * @return the deserializer instance
+   * @throws NullPointerException
+   *           if any of the provided arguments, except the configuration, are
+   *           {@code null}
+   * @throws IllegalArgumentException
+   *           if the provided class is not bound to a Module assembly or field
+   * @throws UnsupportedOperationException
+   *           if the requested format is not supported by the implementation
+   * @see #getBoundDefinitionForClass(Class)
+   */
+  @NonNull
+  <CLASS extends IBoundObject> IDeserializer<CLASS> newDeserializer(
+      @NonNull Format format,
+      @NonNull Class<CLASS> clazz);
+
+  /**
+   * Get a new {@link IBoundLoader} instance.
+   *
+   * @return the instance
+   */
+  @NonNull
+  IBoundLoader newBoundLoader();
+
+  /**
+   * Create a deep copy of the provided bound object.
+   *
+   * @param <CLASS>
+   *          the bound object type
+   * @param other
+   *          the object to copy
+   * @param parentInstance
+   *          the object's parent or {@code null}
+   * @return a deep copy of the provided object
+   * @throws BindingException
+   *           if an error occurred copying content between java instances
+   * @throws NullPointerException
+   *           if the provided object is {@code null}
+   * @throws IllegalArgumentException
+   *           if the provided class is not bound to a Module assembly or field
+   */
+  @NonNull
+  <CLASS extends IBoundObject> CLASS deepCopy(@NonNull CLASS other, IBoundObject parentInstance)
+      throws BindingException;
+
+  /**
+   * Get a new single use constraint validator.
+   *
+   * @param handler
+   *          the validation handler to use to process the validation results
+   * @param config
+   *          the validation configuration
+   *
+   * @return the validator
+   */
+  default IConstraintValidator newValidator(
+      @NonNull IConstraintValidationHandler handler,
+      @Nullable IConfiguration<ValidationFeature<?>> config) {
+    IBoundLoader loader = newBoundLoader();
+    loader.disableFeature(DeserializationFeature.DESERIALIZE_VALIDATE_CONSTRAINTS);
+
+    DynamicContext context = new DynamicContext();
+    context.setDocumentLoader(loader);
+
+    DefaultConstraintValidator retval = new DefaultConstraintValidator(handler);
+    if (config != null) {
+      retval.applyConfiguration(config);
+    }
+    return retval;
+  }
+
+  /**
+   * Perform constraint validation on the provided bound object represented as an
+   * {@link INodeItem}.
+   *
+   * @param nodeItem
+   *          the node item to validate
+   * @param loader
+   *          a module loader used to load and resolve referenced resources
+   * @param config
+   *          the validation configuration
+   * @return the validation result
+   * @throws IllegalArgumentException
+   *           if the provided class is not bound to a Module assembly or field
+   */
+  default IValidationResult validate(
+      @NonNull INodeItem nodeItem,
+      @NonNull IBoundLoader loader,
+      @Nullable IConfiguration<ValidationFeature<?>> config) {
+    FindingCollectingConstraintValidationHandler handler = new FindingCollectingConstraintValidationHandler();
+    IConstraintValidator validator = newValidator(handler, config);
+
+    StaticContext staticContext = StaticContext.builder()
+        .defaultModelNamespace(nodeItem.getNamespace())
+        .build();
+
+    DynamicContext dynamicContext = new DynamicContext(staticContext);
+    dynamicContext.setDocumentLoader(loader);
+    validator.validate(nodeItem, dynamicContext);
+    validator.finalizeValidation(dynamicContext);
+    return handler;
+  }
+
+  /**
+   * Load and perform schema and constraint validation on the target. The
+   * constraint validation will only be performed if the schema validation passes.
+   *
+   * @param target
+   *          the target to validate
+   * @param asFormat
+   *          the schema format to use to validate the target
+   * @param schemaProvider
+   *          provides callbacks to get the appropriate schemas
+   * @param config
+   *          the validation configuration
+   * @return the validation result
+   * @throws IOException
+   *           if an error occurred while reading the target
+   */
+  default IValidationResult validate(
+      @NonNull URI target,
+      @NonNull Format asFormat,
+      @NonNull ISchemaValidationProvider schemaProvider,
+      @Nullable IConfiguration<ValidationFeature<?>> config) throws IOException {
+
+    IValidationResult retval = schemaProvider.validate(target, asFormat);
+
+    if (retval.isPassing()) {
+      IValidationResult constraintValidationResult = validateWithConstraints(target, config);
+      retval = AggregateValidationResult.aggregate(retval, constraintValidationResult);
+    }
+    return retval;
+  }
+
+  /**
+   * Load and validate the provided {@code target} using the associated Module
+   * module constraints.
+   *
+   * @param target
+   *          the file to load and validate
+   * @param config
+   *          the validation configuration
+   * @return the validation results
+   * @throws IOException
+   *           if an error occurred while parsing the target
+   */
+  default IValidationResult validateWithConstraints(
+      @NonNull URI target,
+      @Nullable IConfiguration<ValidationFeature<?>> config)
+      throws IOException {
+    IBoundLoader loader = newBoundLoader();
+    loader.disableFeature(DeserializationFeature.DESERIALIZE_VALIDATE_CONSTRAINTS);
+    IDocumentNodeItem nodeItem = loader.loadAsNodeItem(target);
+
+    return validate(nodeItem, loader, config);
+  }
+
+  interface IModuleLoaderStrategy {
+    /**
+     * Load the bound Metaschema module represented by the provided class.
+     * <p>
+     * Implementations are allowed to return a cached instance if the module has
+     * already been loaded.
+     *
+     * @param clazz
+     *          the Module class
+     * @return the module
+     * @throws IllegalStateException
+     *           if an error occurred while processing the associated module
+     *           information
+     */
+    @NonNull
+    IBoundModule loadModule(@NonNull Class<? extends IBoundModule> clazz);
+
+    /**
+     * Get the {@link IBoundDefinitionModel} instance associated with the provided
+     * Java class.
+     * <p>
+     * Typically the class will have a {@link MetaschemaAssembly} or
+     * {@link MetaschemaField} annotation.
+     *
+     * @param clazz
+     *          the class binding to load
+     * @return the associated class binding instance or {@code null} if the class is
+     *         not bound
+     */
+    @Nullable
+    IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<? extends IBoundObject> clazz);
+  }
+
+  interface ISchemaValidationProvider {
+
+    @NonNull
+    default IValidationResult validate(@NonNull URI target, @NonNull Format asFormat)
+        throws FileNotFoundException, IOException {
+      URL targetResource = ObjectUtils.notNull(target.toURL());
+
+      IValidationResult retval;
+      switch (asFormat) {
+      case JSON: {
+        JSONObject json;
+        try (@SuppressWarnings("resource") InputStream is
+            = new BufferedInputStream(ObjectUtils.notNull(targetResource.openStream()))) {
+          json = new JSONObject(new JSONTokener(is));
+        }
+        retval = new JsonSchemaContentValidator(getJsonSchema(json)).validate(json, target);
+        break;
+      }
+      case XML:
+        try {
+          List<Source> schemaSources = getXmlSchemas(targetResource);
+          retval = new XmlSchemaContentValidator(schemaSources).validate(target);
+        } catch (SAXException ex) {
+          throw new IOException(ex);
+        }
+        break;
+      case YAML: {
+        JSONObject json = YamlOperations.yamlToJson(YamlOperations.parseYaml(target));
+        assert json != null;
+        retval = new JsonSchemaContentValidator(getJsonSchema(json)).validate(json, ObjectUtils.notNull(target));
+        break;
+      }
+      default:
+        throw new UnsupportedOperationException("Unsupported format: " + asFormat.name());
+      }
+      return retval;
+    }
+
+    /**
+     * Get a JSON schema to use for content validation.
+     *
+     * @param json
+     *          the JSON content to validate
+     *
+     * @return the JSON schema
+     * @throws IOException
+     *           if an error occurred while loading the schema
+     */
+    @NonNull
+    JSONObject getJsonSchema(@NonNull JSONObject json) throws IOException;
+
+    /**
+     * Get a XML schema to use for content validation.
+     *
+     * @param targetResource
+     *          the URL for the XML content to validate
+     *
+     * @return the XML schema sources
+     * @throws IOException
+     *           if an error occurred while loading the schema
+     */
+    @NonNull
+    List<Source> getXmlSchemas(@NonNull URL targetResource) throws IOException;
+  }
+
+  /**
+   * Implementations of this interface provide a means by which a bound class can
+   * be found that corresponds to an XML element, JSON property, or YAML item
+   * name.
+   */
+  interface IBindingMatcher {
+    @SuppressWarnings("PMD.ShortMethodName")
+    @NonNull
+    static IBindingMatcher of(IBoundDefinitionModelAssembly assembly) {
+      if (!assembly.isRoot()) {
+        throw new IllegalArgumentException(
+            String.format("The provided class '%s' is not a root assembly.", assembly.getBoundClass().getName()));
+      }
+      return new RootAssemblyBindingMatcher(assembly);
+    }
+
+    /**
+     * Determine the bound class for the provided XML {@link QName}.
+     *
+     * @param rootQName
+     *          the root XML element's QName
+     * @return the bound class for the XML qualified name or {@code null} if not
+     *         recognized
+     */
+    Class<? extends IBoundObject> getBoundClassForXmlQName(QName rootQName);
+
+    /**
+     * Determine the bound class for the provided JSON/YAML property/item name.
+     *
+     * @param rootName
+     *          the JSON/YAML property/item name
+     * @return the bound class for the JSON property name or {@code null} if not
+     *         recognized
+     */
+    Class<? extends IBoundObject> getBoundClassForJsonName(String rootName);
+  }
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/PostProcessingModuleLoaderStrategy.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/PostProcessingModuleLoaderStrategy.java
index 438e8c1d0..d6995b20c 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/PostProcessingModuleLoaderStrategy.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/PostProcessingModuleLoaderStrategy.java
@@ -26,10 +26,11 @@
 
 package gov.nist.secauto.metaschema.databind;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.core.model.IModuleLoader;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
-import gov.nist.secauto.metaschema.databind.model.IBoundModule;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -42,7 +43,7 @@ class PostProcessingModuleLoaderStrategy
     extends SimpleModuleLoaderStrategy {
   @NonNull
   private final List<IModuleLoader.IModulePostProcessor> modulePostProcessors;
-  private final Set<IBoundModule> resolvedModules = new HashSet<>();
+  private final Set<IModule> resolvedModules = new HashSet<>();
 
   protected PostProcessingModuleLoaderStrategy(
       @NonNull IBindingContext bindingContext,
@@ -57,11 +58,11 @@ protected List<IModuleLoader.IModulePostProcessor> getModulePostProcessors() {
   }
 
   @Override
-  public IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<?> clazz) {
+  public IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<? extends IBoundObject> clazz) {
     IBoundDefinitionModelComplex retval = super.getBoundDefinitionForClass(clazz);
     if (retval != null) {
       // force loading of metaschema information to apply constraints
-      IBoundModule module = retval.getContainingModule();
+      IModule module = retval.getContainingModule();
       synchronized (resolvedModules) {
         if (!resolvedModules.contains(module)) {
           // add first, to avoid loops
@@ -73,7 +74,7 @@ public IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<?>
     return retval;
   }
 
-  private void handleModule(@NonNull IBoundModule module) {
+  private void handleModule(@NonNull IModule module) {
     for (IModuleLoader.IModulePostProcessor postProcessor : getModulePostProcessors()) {
       postProcessor.processModule(module);
     }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/RootAssemblyBindingMatcher.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/RootAssemblyBindingMatcher.java
index b4bbf8e00..927207299 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/RootAssemblyBindingMatcher.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/RootAssemblyBindingMatcher.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.databind.IBindingContext.IBindingMatcher;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 
@@ -46,7 +47,7 @@ protected IBoundDefinitionModelAssembly getDefinition() {
     return definition;
   }
 
-  protected Class<?> getClazz() {
+  protected Class<? extends IBoundObject> getClazz() {
     return getDefinition().getBoundClass();
   }
 
@@ -63,12 +64,12 @@ protected String getRootJsonName() {
   }
 
   @Override
-  public Class<?> getBoundClassForXmlQName(QName rootQName) {
+  public Class<? extends IBoundObject> getBoundClassForXmlQName(QName rootQName) {
     return getRootQName().equals(rootQName) ? getClazz() : null;
   }
 
   @Override
-  public Class<?> getBoundClassForJsonName(String rootName) {
+  public Class<? extends IBoundObject> getBoundClassForJsonName(String rootName) {
     return getRootJsonName().equals(rootName) ? getClazz() : null;
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/SimpleModuleLoaderStrategy.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/SimpleModuleLoaderStrategy.java
index 9399542da..bdb4d4c39 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/SimpleModuleLoaderStrategy.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/SimpleModuleLoaderStrategy.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.AbstractBoundModule;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
@@ -72,7 +73,7 @@ public IBoundModule loadModule(@NonNull Class<? extends IBoundModule> clazz) {
   }
 
   @Override
-  public IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<?> clazz) {
+  public IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<? extends IBoundObject> clazz) {
     IBoundDefinitionModelComplex retval;
     synchronized (this) {
       retval = definitionsByClass.get(clazz);
@@ -87,12 +88,12 @@ public IBoundDefinitionModelComplex getBoundDefinitionForClass(@NonNull Class<?>
   }
 
   @Nullable
-  private IBoundDefinitionModelComplex newBoundDefinition(@NonNull Class<?> clazz) {
+  private IBoundDefinitionModelComplex newBoundDefinition(@NonNull Class<? extends IBoundObject> clazz) {
     IBoundDefinitionModelComplex retval = null;
     if (clazz.isAnnotationPresent(MetaschemaAssembly.class)) {
-      retval = new DefinitionAssembly(clazz, getBindingContext());
+      retval = DefinitionAssembly.newInstance(clazz, getBindingContext());
     } else if (clazz.isAnnotationPresent(MetaschemaField.class)) {
-      retval = new DefinitionField(clazz, getBindingContext());
+      retval = DefinitionField.newInstance(clazz, getBindingContext());
     }
     return retval;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ClassUtils.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ClassUtils.java
index 6953cc97d..be18276b6 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ClassUtils.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ClassUtils.java
@@ -26,7 +26,9 @@
 
 package gov.nist.secauto.metaschema.databind.codegen;
 
-import gov.nist.secauto.metaschema.databind.codegen.impl.NameConverter;
+import org.apache.xmlbeans.impl.common.NameUtil;
+
+import java.util.Map;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -34,6 +36,9 @@
  * A variety of utility methods for normalizing Java class related names.
  */
 public final class ClassUtils {
+  private static final Map<String, String> JAVA_NAME_MAPPER = Map.ofEntries(
+      Map.entry("Class", "Clazz"));
+
   private ClassUtils() {
     // disable construction
   }
@@ -49,7 +54,8 @@ private ClassUtils() {
   @SuppressWarnings("null")
   @NonNull
   public static String toPropertyName(@NonNull String name) {
-    return NameConverter.STANDARD.toPropertyName(name);
+    String property = NameUtil.upperCamelCase(name);
+    return JAVA_NAME_MAPPER.getOrDefault(property, property);
   }
 
   /**
@@ -63,7 +69,7 @@ public static String toPropertyName(@NonNull String name) {
   @SuppressWarnings("null")
   @NonNull
   public static String toVariableName(@NonNull String name) {
-    return NameConverter.STANDARD.toVariableName(name);
+    return NameUtil.lowerCamelCase(name);
   }
 
   /**
@@ -77,7 +83,7 @@ public static String toVariableName(@NonNull String name) {
   @SuppressWarnings("null")
   @NonNull
   public static String toClassName(@NonNull String name) {
-    return NameConverter.STANDARD.toClassName(name);
+    return NameUtil.upperCamelCase(name, false);
   }
 
   /**
@@ -91,7 +97,6 @@ public static String toClassName(@NonNull String name) {
   @SuppressWarnings("null")
   @NonNull
   public static String toPackageName(@NonNull String name) {
-    return NameConverter.STANDARD.toPackageName(name);
+    return NameUtil.getPackageFromNamespace(name, false);
   }
-
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedDefinitionClass.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedDefinitionClass.java
index c84080227..3fee0a0e8 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedDefinitionClass.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/IGeneratedDefinitionClass.java
@@ -26,7 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.codegen;
 
-import gov.nist.secauto.metaschema.core.model.IContainerFlag;
+import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -38,7 +38,7 @@ public interface IGeneratedDefinitionClass extends IGeneratedClass {
    * @return the definition
    */
   @NonNull
-  IContainerFlag getDefinition();
+  IModelDefinition getDefinition();
 
   /**
    * Indicates if the class represents a root Module assembly which can be the
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/JavaGenerator.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/JavaGenerator.java
index 901acb846..07bb25cd9 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/JavaGenerator.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/JavaGenerator.java
@@ -1,102 +1,102 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.codegen;
-
-import gov.nist.secauto.metaschema.core.model.IModule;
-import gov.nist.secauto.metaschema.core.util.CollectionUtil;
-import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.Objects;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-/**
- * Provides methods for generating Java classes based on a single or a
- * collection of Metaschemas.
- */
-public final class JavaGenerator {
-  private static final Logger LOGGER = LogManager.getLogger(JavaGenerator.class);
-
-  private JavaGenerator() {
-    // disable construction
-  }
-
-  /**
-   * Generate Java sources for the provided Metaschema module.
-   *
-   * @param module
-   *          the Metaschema module to generate Java sources for
-   * @param targetDir
-   *          the directory to generate sources in
-   * @param bindingConfiguration
-   *          the binding customizations to use when generating the Java classes
-   * @return information about all the produced classes
-   * @throws IOException
-   *           if an error occurred while generating the class
-   */
-  public static IProduction generate(
-      @NonNull IModule module,
-      @NonNull Path targetDir,
-      @NonNull IBindingConfiguration bindingConfiguration) throws IOException {
-    return generate(CollectionUtil.singletonList(module), targetDir, bindingConfiguration);
-  }
-
-  /**
-   * Generates Java classes for Module fields and flags.
-   *
-   * @param modules
-   *          the Metaschema modules to build classes for
-   * @param targetDirectory
-   *          the directory to generate classes in
-   * @param bindingConfiguration
-   *          binding customizations that can be used to set namespaces, class
-   *          names, and other aspects of generated classes
-   * @return information about all the produced classes
-   * @throws IOException
-   *           if a build error occurred while generating the class
-   */
-  @NonNull
-  public static IProduction generate(
-      @NonNull Collection<? extends IModule> modules,
-      @NonNull Path targetDirectory,
-      @NonNull IBindingConfiguration bindingConfiguration) throws IOException {
-    Objects.requireNonNull(modules, "metaschemas");
-    Objects.requireNonNull(targetDirectory, "generationTargetDirectory");
-    Objects.requireNonNull(bindingConfiguration, "bindingConfiguration");
-    if (LOGGER.isInfoEnabled()) {
-      LOGGER.info("Generating Java classes in: {}", targetDirectory);
-    }
-
-    return IProduction.of(modules, bindingConfiguration, targetDirectory);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.codegen;
+
+import gov.nist.secauto.metaschema.core.model.IModule;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.databind.codegen.config.IBindingConfiguration;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Objects;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * Provides methods for generating Java classes based on a single or a
+ * collection of Metaschemas.
+ */
+public final class JavaGenerator {
+  private static final Logger LOGGER = LogManager.getLogger(JavaGenerator.class);
+
+  private JavaGenerator() {
+    // disable construction
+  }
+
+  /**
+   * Generate Java sources for the provided Metaschema module.
+   *
+   * @param module
+   *          the Metaschema module to generate Java sources for
+   * @param targetDir
+   *          the directory to generate sources in
+   * @param bindingConfiguration
+   *          the binding customizations to use when generating the Java classes
+   * @return information about all the produced classes
+   * @throws IOException
+   *           if an error occurred while generating the class
+   */
+  public static IProduction generate(
+      @NonNull IModule module,
+      @NonNull Path targetDir,
+      @NonNull IBindingConfiguration bindingConfiguration) throws IOException {
+    return generate(CollectionUtil.singletonList(module), targetDir, bindingConfiguration);
+  }
+
+  /**
+   * Generates Java classes for Module fields and flags.
+   *
+   * @param modules
+   *          the Metaschema modules to build classes for
+   * @param targetDirectory
+   *          the directory to generate classes in
+   * @param bindingConfiguration
+   *          binding customizations that can be used to set namespaces, class
+   *          names, and other aspects of generated classes
+   * @return information about all the produced classes
+   * @throws IOException
+   *           if a build error occurred while generating the class
+   */
+  @NonNull
+  public static IProduction generate(
+      @NonNull Collection<? extends IModule> modules,
+      @NonNull Path targetDirectory,
+      @NonNull IBindingConfiguration bindingConfiguration) throws IOException {
+    Objects.requireNonNull(modules, "metaschemas");
+    Objects.requireNonNull(targetDirectory, "generationTargetDirectory");
+    Objects.requireNonNull(bindingConfiguration, "bindingConfiguration");
+    if (LOGGER.isInfoEnabled()) {
+      LOGGER.info("Generating Java classes in: {}", targetDirectory);
+    }
+
+    return IProduction.of(modules, bindingConfiguration, targetDirectory);
+  }
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ModuleCompilerHelper.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ModuleCompilerHelper.java
index eb1167e35..1d2929f82 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ModuleCompilerHelper.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/ModuleCompilerHelper.java
@@ -33,6 +33,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.eclipse.jdt.annotation.Owning;
 
 import java.io.IOException;
 import java.lang.module.ModuleDescriptor;
@@ -138,21 +139,26 @@ public static IProduction compileModule(
    *          load a class
    * @return the new class loader
    */
-  @SuppressWarnings("null")
   @NonNull
   public static ClassLoader newClassLoader(
       @NonNull final Path classDir,
       @NonNull final ClassLoader parent) {
-    return AccessController.doPrivileged(new PrivilegedAction<>() {
-      @Override
-      public URLClassLoader run() {
-        try {
-          return new URLClassLoader(new URL[] { classDir.toUri().toURL() }, parent);
-        } catch (MalformedURLException ex) {
-          throw new IllegalStateException("unable to configure class loader", ex);
-        }
-      }
-    });
+    ClassLoader retval = AccessController
+        .doPrivileged((PrivilegedAction<ClassLoader>) () -> newClassLoaderInternal(classDir, parent));
+    assert retval != null;
+    return retval;
+  }
+
+  @Owning
+  @NonNull
+  private static ClassLoader newClassLoaderInternal(
+      @NonNull final Path classDir,
+      @NonNull final ClassLoader parent) {
+    try {
+      return new URLClassLoader(new URL[] { classDir.toUri().toURL() }, parent);
+    } catch (MalformedURLException ex) {
+      throw new IllegalStateException("unable to configure class loader", ex);
+    }
   }
 
   @SuppressWarnings({
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/PackageProductionImpl.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/PackageProductionImpl.java
index 53b37abed..99a3ba943 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/PackageProductionImpl.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/PackageProductionImpl.java
@@ -33,6 +33,7 @@
 import java.nio.file.Path;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 class PackageProductionImpl implements IPackageProduction {
   @NonNull
@@ -40,6 +41,7 @@ class PackageProductionImpl implements IPackageProduction {
   @NonNull
   private final IGeneratedClass packageInfoClass;
 
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public PackageProductionImpl(
       @NonNull PackageMetadata metadata,
       @NonNull IMetaschemaClassFactory classFactory,
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfiguration.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfiguration.java
index 767017e84..a86b13bcf 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfiguration.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultBindingConfiguration.java
@@ -30,6 +30,7 @@
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.core.model.IModule;
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.codegen.ClassUtils;
 import gov.nist.secauto.metaschema.databind.codegen.xmlbeans.JavaModelBindingType;
@@ -49,6 +50,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
@@ -58,7 +60,7 @@
 
 public class DefaultBindingConfiguration implements IBindingConfiguration {
   private final Map<String, String> namespaceToPackageNameMap = new ConcurrentHashMap<>();
-  // metaschema location -> ModelType -> Definition Name -> IBindingConfiguration
+  // metaschema location -> ModelType -> Definition name -> IBindingConfiguration
   private final Map<String, MetaschemaBindingConfiguration> moduleUrlToMetaschemaBindingConfigurationMap
       = new ConcurrentHashMap<>();
 
@@ -79,7 +81,7 @@ public String getPackageNameForModule(IModule module) {
   @Nullable
   public IDefinitionBindingConfiguration getBindingConfigurationForDefinition(
       @NonNull IModelDefinition definition) {
-    String moduleUri = ObjectUtils.notNull(definition.getContainingModule().getLocation().toString());
+    String moduleUri = ObjectUtils.notNull(definition.getContainingModule().getLocation().toASCIIString());
     String definitionName = definition.getName();
 
     MetaschemaBindingConfiguration metaschemaConfig = getMetaschemaBindingConfiguration(moduleUri);
@@ -104,12 +106,9 @@ public IDefinitionBindingConfiguration getBindingConfigurationForDefinition(
   @Override
   public String getQualifiedBaseClassName(IModelDefinition definition) {
     IDefinitionBindingConfiguration config = getBindingConfigurationForDefinition(definition);
-
-    String retval = null;
-    if (config != null) {
-      retval = config.getQualifiedBaseClassName();
-    }
-    return retval;
+    return config == null
+        ? null
+        : config.getQualifiedBaseClassName();
   }
 
   @Override
@@ -133,6 +132,14 @@ public String getClassName(IModelDefinition definition) {
     return ClassUtils.toClassName(module.getShortName() + "Module");
   }
 
+  @Override
+  public List<String> getQualifiedSuperinterfaceClassNames(IModelDefinition definition) {
+    IDefinitionBindingConfiguration config = getBindingConfigurationForDefinition(definition);
+    return config == null
+        ? CollectionUtil.emptyList()
+        : config.getInterfacesToImplement();
+  }
+
   /**
    * Binds an XML namespace, which is normally associated with one or more Module,
    * with a provided Java package name.
@@ -236,7 +243,7 @@ public MetaschemaBindingConfiguration addMetaschemaBindingConfiguration(
    *           if an error occurred while reading the {@code file}
    */
   public void load(Path file) throws IOException {
-    URL resource = file.toUri().toURL();
+    URL resource = file.toAbsolutePath().normalize().toUri().toURL();
     load(resource);
   }
 
@@ -249,8 +256,7 @@ public void load(Path file) throws IOException {
    *           if an error occurred while reading the {@code file}
    */
   public void load(File file) throws IOException {
-    URL resource = file.toURI().toURL();
-    load(resource);
+    load(file.toPath());
   }
 
   /**
@@ -299,7 +305,7 @@ private void processMetaschemaBindingConfig(URL configResource, MetaschemaBindin
       throws MalformedURLException, URISyntaxException {
     String href = metaschema.getHref();
     URL moduleUrl = new URL(configResource, href);
-    String moduleUri = ObjectUtils.notNull(moduleUrl.toURI().toString());
+    String moduleUri = ObjectUtils.notNull(moduleUrl.toURI().normalize().toString());
 
     MetaschemaBindingConfiguration metaschemaConfig = getMetaschemaBindingConfiguration(moduleUri);
     if (metaschemaConfig == null) {
@@ -325,12 +331,9 @@ private void processMetaschemaBindingConfig(URL configResource, MetaschemaBindin
   private static IMutableDefinitionBindingConfiguration processDefinitionBindingConfiguration(
       @Nullable IDefinitionBindingConfiguration oldConfig,
       @NonNull ObjectDefinitionBindingType objectDefinitionBinding) {
-    IMutableDefinitionBindingConfiguration config;
-    if (oldConfig != null) {
-      config = new DefaultDefinitionBindingConfiguration(oldConfig);
-    } else {
-      config = new DefaultDefinitionBindingConfiguration();
-    }
+    IMutableDefinitionBindingConfiguration config = oldConfig == null
+        ? new DefaultDefinitionBindingConfiguration()
+        : new DefaultDefinitionBindingConfiguration(oldConfig);
 
     if (objectDefinitionBinding.isSetJava()) {
       JavaObjectDefinitionBindingType java = objectDefinitionBinding.getJava();
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java
index aa73bd623..c9c9b5486 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java
@@ -26,11 +26,8 @@
 
 package gov.nist.secauto.metaschema.databind.codegen.config;
 
-import gov.nist.secauto.metaschema.core.util.CollectionUtil;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.LinkedList;
+import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -41,7 +38,7 @@ public class DefaultDefinitionBindingConfiguration implements IMutableDefinition
   @Nullable
   private String baseClassName;
   @NonNull
-  private final Set<String> interfacesToImplement = new HashSet<>();
+  private final List<String> interfacesToImplement = new LinkedList<>();
 
   /**
    * Create a new definition binding configuration.
@@ -84,9 +81,8 @@ public void setQualifiedBaseClassName(String name) {
   }
 
   @Override
-  public Collection<String> getInterfacesToImplement() {
-    return interfacesToImplement.isEmpty() ? CollectionUtil.emptySet()
-        : CollectionUtil.unmodifiableCollection(interfacesToImplement);
+  public List<String> getInterfacesToImplement() {
+    return interfacesToImplement;
   }
 
   @Override
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IBindingConfiguration.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IBindingConfiguration.java
index da7277f45..c2bb53b87 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IBindingConfiguration.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IBindingConfiguration.java
@@ -29,6 +29,8 @@
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.core.model.IModule;
 
+import java.util.List;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -75,4 +77,15 @@ public interface IBindingConfiguration {
    */
   @Nullable
   String getQualifiedBaseClassName(@NonNull IModelDefinition definition);
+
+  /**
+   * Get the Java class names of the superinterfaces to use for the class
+   * associated with the provided definition.
+   *
+   * @param definition
+   *          a definition that may be built as a class
+   * @return a list of superinterface class names
+   */
+  @NonNull
+  List<String> getQualifiedSuperinterfaceClassNames(@NonNull IModelDefinition definition);
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IDefinitionBindingConfiguration.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IDefinitionBindingConfiguration.java
index 0f12ed10a..8cf94f389 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IDefinitionBindingConfiguration.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/config/IDefinitionBindingConfiguration.java
@@ -26,7 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.codegen.config;
 
-import java.util.Collection;
+import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -56,5 +56,5 @@ public interface IDefinitionBindingConfiguration {
    * @return a list of fully qualified type names for interfaces
    */
   @NonNull
-  Collection<String> getInterfacesToImplement();
+  List<String> getInterfacesToImplement();
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/AnnotationGenerator.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/AnnotationGenerator.java
index 0af383be0..14d94e43b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/AnnotationGenerator.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/AnnotationGenerator.java
@@ -34,8 +34,6 @@
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
-import gov.nist.secauto.metaschema.core.metapath.StaticContext;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
@@ -135,10 +133,9 @@ private static void buildConstraint(Class<?> annotationType, AnnotationSpec.Buil
 
     annotation.addMember("level", "$T.$L", IConstraint.Level.class, constraint.getLevel());
 
-    MetapathExpression target = constraint.getTarget();
-    String path = target.getPath();
-    if (!path.equals(getDefaultValue(annotationType, "target"))) {
-      annotation.addMember("target", "$S", path);
+    String target = constraint.getTarget();
+    if (!target.equals(getDefaultValue(annotationType, "target"))) {
+      annotation.addMember("target", "$S", target);
     }
   }
 
@@ -147,6 +144,7 @@ public static void buildValueConstraints(
       @NonNull IFlagDefinition definition) {
     if (!definition.getConstraints().isEmpty()) {
       AnnotationSpec.Builder annotation = AnnotationSpec.builder(ValueConstraints.class);
+      assert annotation != null;
 
       applyAllowedValuesConstraints(annotation, definition.getAllowedValuesConstraints());
       applyIndexHasKeyConstraints(annotation, definition.getIndexHasKeyConstraints());
@@ -168,6 +166,7 @@ public static void buildValueConstraints(
 
     if (!allowedValues.isEmpty() || !indexHasKey.isEmpty() || !matches.isEmpty() || !expects.isEmpty()) {
       AnnotationSpec.Builder annotation = AnnotationSpec.builder(ValueConstraints.class);
+      assert annotation != null;
 
       applyAllowedValuesConstraints(annotation, allowedValues);
       applyIndexHasKeyConstraints(annotation, indexHasKey);
@@ -197,8 +196,9 @@ public static void buildAssemblyConstraints(
     }
   }
 
-  private static void applyAllowedValuesConstraints(AnnotationSpec.Builder annotation,
-      List<? extends IAllowedValuesConstraint> constraints) {
+  private static void applyAllowedValuesConstraints(
+      @NonNull AnnotationSpec.Builder annotation,
+      @NonNull List<? extends IAllowedValuesConstraint> constraints) {
     for (IAllowedValuesConstraint constraint : constraints) {
       AnnotationSpec.Builder constraintAnnotation = AnnotationSpec.builder(AllowedValues.class);
       buildConstraint(AllowedValues.class, constraintAnnotation, constraint);
@@ -225,8 +225,9 @@ private static void applyAllowedValuesConstraints(AnnotationSpec.Builder annotat
     }
   }
 
-  private static void applyIndexHasKeyConstraints(AnnotationSpec.Builder annotation,
-      List<? extends IIndexHasKeyConstraint> constraints) {
+  private static void applyIndexHasKeyConstraints(
+      @NonNull AnnotationSpec.Builder annotation,
+      @NonNull List<? extends IIndexHasKeyConstraint> constraints) {
     for (IIndexHasKeyConstraint constraint : constraints) {
       AnnotationSpec.Builder constraintAnnotation = AnnotationSpec.builder(IndexHasKey.class);
       buildConstraint(IndexHasKey.class, constraintAnnotation, constraint);
@@ -244,15 +245,15 @@ private static void applyIndexHasKeyConstraints(AnnotationSpec.Builder annotatio
     }
   }
 
-  private static void buildKeyFields(@NonNull Builder constraintAnnotation,
+  private static void buildKeyFields(
+      @NonNull Builder constraintAnnotation,
       @NonNull List<? extends IKeyField> keyFields) {
     for (IKeyField key : keyFields) {
       AnnotationSpec.Builder keyAnnotation = AnnotationSpec.builder(KeyField.class);
 
-      MetapathExpression target = key.getTarget();
-      String path = target.getPath();
-      if (!path.equals(getDefaultValue(KeyField.class, "target"))) {
-        keyAnnotation.addMember("target", "$S", path);
+      String target = key.getTarget();
+      if (!target.equals(getDefaultValue(KeyField.class, "target"))) {
+        keyAnnotation.addMember("target", "$S", target);
       }
 
       Pattern pattern = key.getPattern();
@@ -269,8 +270,9 @@ private static void buildKeyFields(@NonNull Builder constraintAnnotation,
     }
   }
 
-  private static void applyMatchesConstraints(AnnotationSpec.Builder annotation,
-      List<? extends IMatchesConstraint> constraints) {
+  private static void applyMatchesConstraints(
+      @NonNull AnnotationSpec.Builder annotation,
+      @NonNull List<? extends IMatchesConstraint> constraints) {
     for (IMatchesConstraint constraint : constraints) {
       AnnotationSpec.Builder constraintAnnotation = AnnotationSpec.builder(Matches.class);
       buildConstraint(Matches.class, constraintAnnotation, constraint);
@@ -293,15 +295,15 @@ private static void applyMatchesConstraints(AnnotationSpec.Builder annotation,
     }
   }
 
-  private static void applyExpectConstraints(AnnotationSpec.Builder annotation,
-      List<? extends IExpectConstraint> constraints) {
+  private static void applyExpectConstraints(
+      @NonNull AnnotationSpec.Builder annotation,
+      @NonNull List<? extends IExpectConstraint> constraints) {
     for (IExpectConstraint constraint : constraints) {
       AnnotationSpec.Builder constraintAnnotation = AnnotationSpec.builder(Expect.class);
 
       buildConstraint(Expect.class, constraintAnnotation, constraint);
 
-      MetapathExpression test = constraint.getTest();
-      constraintAnnotation.addMember("test", "$S", test.getPath());
+      constraintAnnotation.addMember("test", "$S", constraint.getTest());
 
       if (constraint.getMessage() != null) {
         constraintAnnotation.addMember("message", "$S", constraint.getMessage());
@@ -316,8 +318,9 @@ private static void applyExpectConstraints(AnnotationSpec.Builder annotation,
     }
   }
 
-  private static void applyIndexConstraints(AnnotationSpec.Builder annotation,
-      List<? extends IIndexConstraint> constraints) {
+  private static void applyIndexConstraints(
+      @NonNull AnnotationSpec.Builder annotation,
+      @NonNull List<? extends IIndexConstraint> constraints) {
     for (IIndexConstraint constraint : constraints) {
       AnnotationSpec.Builder constraintAnnotation = AnnotationSpec.builder(Index.class);
 
@@ -336,8 +339,9 @@ private static void applyIndexConstraints(AnnotationSpec.Builder annotation,
     }
   }
 
-  private static void applyUniqueConstraints(AnnotationSpec.Builder annotation,
-      List<? extends IUniqueConstraint> constraints) {
+  private static void applyUniqueConstraints(
+      @NonNull AnnotationSpec.Builder annotation,
+      @NonNull List<? extends IUniqueConstraint> constraints) {
     for (IUniqueConstraint constraint : constraints) {
       AnnotationSpec.Builder constraintAnnotation = ObjectUtils.notNull(AnnotationSpec.builder(IsUnique.class));
 
@@ -364,7 +368,7 @@ private static void checkCardinalities(
       @NonNull LogBuilder logBuilder) {
 
     LogBuilder warn = LOGGER.atWarn();
-    for (IDefinitionNodeItem<?, ?> item : instanceSet.asList()) {
+    for (IDefinitionNodeItem<?, ?> item : instanceSet.getValue()) {
       INamedInstance instance = item.getInstance();
       if (instance instanceof INamedModelInstanceAbsolute) {
         INamedModelInstanceAbsolute modelInstance = (INamedModelInstanceAbsolute) instance;
@@ -374,7 +378,7 @@ private static void checkCardinalities(
       } else {
         warn.log(String.format(
             "Definition '%s' has min-occurs=%d cardinality constraint targeting '%s' that is not a model instance",
-            definition.getName(), constraint.getMinOccurs(), constraint.getTarget().getPath()));
+            definition.getName(), constraint.getMinOccurs(), constraint.getTarget()));
       }
     }
   }
@@ -393,14 +397,14 @@ private static void checkMinOccurs(
         logBuilder.log(String.format(
             "Definition '%s' has min-occurs=%d cardinality constraint targeting '%s' that is redundant with a"
                 + " targeted instance named '%s' that requires min-occurs=%d",
-            definition.getName(), minOccurs, constraint.getTarget().getPath(),
+            definition.getName(), minOccurs, constraint.getTarget(),
             modelInstance.getName(),
             modelInstance.getMinOccurs()));
       } else if (minOccurs < modelInstance.getMinOccurs()) {
         logBuilder.log(String.format(
             "Definition '%s' has min-occurs=%d cardinality constraint targeting '%s' that conflicts with a"
                 + " targeted instance named '%s' that requires min-occurs=%d",
-            definition.getName(), minOccurs, constraint.getTarget().getPath(),
+            definition.getName(), minOccurs, constraint.getTarget(),
             modelInstance.getName(),
             modelInstance.getMinOccurs()));
       }
@@ -421,14 +425,14 @@ private static void checkMaxOccurs(
         logBuilder.log(String.format(
             "Definition '%s' has max-occurs=%d cardinality constraint targeting '%s' that is redundant with a"
                 + " targeted instance named '%s' that requires max-occurs=%d",
-            definition.getName(), maxOccurs, constraint.getTarget().getPath(),
+            definition.getName(), maxOccurs, constraint.getTarget(),
             modelInstance.getName(),
             modelInstance.getMaxOccurs()));
       } else if (maxOccurs < modelInstance.getMaxOccurs()) {
         logBuilder.log(String.format(
             "Definition '%s' has max-occurs=%d cardinality constraint targeting '%s' that conflicts with a"
                 + " targeted instance named '%s' that requires max-occurs=%d",
-            definition.getName(), maxOccurs, constraint.getTarget().getPath(),
+            definition.getName(), maxOccurs, constraint.getTarget(),
             modelInstance.getName(),
             modelInstance.getMaxOccurs()));
       }
@@ -440,7 +444,7 @@ private static void applyHasCardinalityConstraints(
       @NonNull AnnotationSpec.Builder annotation,
       @NonNull List<? extends ICardinalityConstraint> constraints) {
 
-    DynamicContext dynamicContext = StaticContext.instance().dynamicContext();
+    DynamicContext dynamicContext = new DynamicContext();
     dynamicContext.disablePredicateEvaluation();
 
     for (ICardinalityConstraint constraint : constraints) {
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java
index 5493a2dbe..00ae607ec 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java
@@ -29,7 +29,7 @@
 import com.squareup.javapoet.ClassName;
 
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
-import gov.nist.secauto.metaschema.core.model.IContainerFlag;
+import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.databind.codegen.IGeneratedDefinitionClass;
 
 import java.nio.file.Path;
@@ -44,7 +44,7 @@ public class DefaultGeneratedDefinitionClass
     extends DefaultGeneratedClass
     implements IGeneratedDefinitionClass {
   @NonNull
-  private final IContainerFlag definition;
+  private final IModelDefinition definition;
 
   /**
    * Construct a new class information object for a generated class.
@@ -57,13 +57,13 @@ public class DefaultGeneratedDefinitionClass
    *          the definition on which the class was based
    */
   public DefaultGeneratedDefinitionClass(@NonNull Path classFile, @NonNull ClassName className,
-      @NonNull IContainerFlag definition) {
+      @NonNull IModelDefinition definition) {
     super(classFile, className);
     this.definition = definition;
   }
 
   @Override
-  public IContainerFlag getDefinition() {
+  public IModelDefinition getDefinition() {
     return definition;
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java
index e6b06e38a..36a3e581a 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java
@@ -28,7 +28,7 @@
 
 import com.squareup.javapoet.ClassName;
 
-import gov.nist.secauto.metaschema.core.model.IContainerFlag;
+import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -47,7 +47,7 @@ public class DefaultGeneratedModuleClass
   @NonNull
   private final IModule module;
   @NonNull
-  private final Map<IContainerFlag, IGeneratedDefinitionClass> definitionClassMap;
+  private final Map<IModelDefinition, IGeneratedDefinitionClass> definitionClassMap;
   @NonNull
   private final String packageName;
 
@@ -55,7 +55,7 @@ public DefaultGeneratedModuleClass(
       @NonNull IModule module,
       @NonNull ClassName className,
       @NonNull Path classFile,
-      @NonNull Map<IContainerFlag, IGeneratedDefinitionClass> definitionClassMap,
+      @NonNull Map<IModelDefinition, IGeneratedDefinitionClass> definitionClassMap,
       @NonNull String packageName) {
     super(classFile, className);
     this.module = module;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/NameConverter.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/NameConverter.java
deleted file mode 100644
index 709db26f5..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/NameConverter.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-/*
- * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-package gov.nist.secauto.metaschema.databind.codegen.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-import javax.lang.model.SourceVersion;
-
-/**
- * Converts aribitrary strings into Java identifiers.
- *
- * @author <a href="mailto:kohsuke.kawaguchi@sun.com">Kohsuke KAWAGUCHI</a>
- */
-public interface NameConverter {
-  /**
-   * The name converter implemented by Code Model.
-   *
-   * This is the standard name conversion for JAXB.
-   */
-  NameConverter STANDARD = new Standard();
-
-  /**
-   * converts a string into an identifier suitable for classes.
-   *
-   * In general, this operation should generate "NamesLikeThis".
-   *
-   * @param token
-   *          the string to convert
-   * @return the equivalent class name
-   */
-  String toClassName(String token);
-
-  /**
-   * converts a string into an identifier suitable for interfaces.
-   *
-   * In general, this operation should generate "NamesLikeThis". But for example,
-   * it can prepend every interface with 'I'.
-   *
-   * @param token
-   *          the string to convert
-   * @return the equivalent interface name
-   */
-  String toInterfaceName(String token);
-
-  /**
-   * Converts a string into an identifier suitable for Java properties.
-   * <p>
-   * In general, this operation should generate upper camel case "NamesLikeThis",
-   * which will be used with known prefixes like "get" or "set".
-   *
-   * @param token
-   *          the string to convert
-   * @return the equivalent Java property name
-   */
-  String toPropertyName(String token);
-
-  /**
-   * converts a string into an identifier suitable for constants.
-   * <p>
-   * In the standard Java naming convention, this operation should generate upper
-   * case "NAMES_LIKE_THIS".
-   *
-   * @param token
-   *          the string to convert
-   * @return the equivalent constant name
-   */
-  String toConstantName(String token);
-
-  /**
-   * Converts a string into an identifier suitable for variables.
-   * <p>
-   * In general it should generate lower camel case "namesLikeThis".
-   *
-   * @param token
-   *          the string to convert
-   * @return the equivalent variable name
-   */
-  String toVariableName(String token);
-
-  /**
-   * Converts a namespace URI into a package name. This method should expect
-   * strings like "http://foo.bar.zot/org", "urn:abc:def:ghi" "", or even "###"
-   * (basically anything) and expected to return a package name, like
-   * "org.acme.foo".
-   *
-   * @param namespaceUri
-   *          the string to convert
-   * @return the equivalent package name
-   */
-  String toPackageName(String namespaceUri);
-
-  class Standard
-      extends NameUtil
-      implements NameConverter {
-
-    @Override
-    public String toClassName(String token) {
-      return toMixedCaseName(toWordList(token), true);
-    }
-
-    @Override
-    public String toVariableName(String token) {
-      return toMixedCaseName(toWordList(token), false);
-    }
-
-    @Override
-    public String toInterfaceName(String token) {
-      return toClassName(token);
-    }
-
-    @Override
-    public String toPropertyName(String token) {
-      String prop = toClassName(token);
-      // property name "Class" with collide with Object.getClass,
-      // so escape this.
-      if ("Class".equals(prop)) {
-        prop = "Clazz";
-      }
-      return prop;
-    }
-
-    /**
-     * Computes a Java package name from a namespace URI, as specified in the spec.
-     *
-     * @return {@code null} if it fails to derive a package name.
-     */
-    @SuppressWarnings({
-        "PMD.CyclomaticComplexity", "PMD.NPathComplexity", // acceptable
-        "PMD.OnlyOneReturn", // readability
-        "PMD.UseStringBufferForStringAppends" // ok
-    })
-    @Override
-    public String toPackageName(String uri) {
-      String nsUri = uri;
-      // remove scheme and :, if present
-      // spec only requires us to remove 'http' and 'urn'...
-      int idx = nsUri.indexOf(':');
-      String scheme = "";
-      if (idx >= 0) {
-        scheme = nsUri.substring(0, idx);
-        if ("http".equalsIgnoreCase(scheme) || "urn".equalsIgnoreCase(scheme)) {
-          nsUri = nsUri.substring(idx + 1);
-        }
-      }
-
-      // tokenize string
-      List<String> tokens = tokenize(nsUri, "/: ");
-      if (tokens.isEmpty()) {
-        return null;
-      }
-
-      // remove trailing file type, if necessary
-      if (tokens.size() > 1) {
-        // for uri's like "www.foo.com" and "foo.com", there is no trailing
-        // file, so there's no need to look at the last '.' and substring
-        // otherwise, we loose the "com" (which would be wrong)
-        String lastToken = tokens.get(tokens.size() - 1);
-        idx = lastToken.lastIndexOf('.');
-        if (idx > 0) {
-          lastToken = lastToken.substring(0, idx);
-          tokens.set(tokens.size() - 1, lastToken);
-        }
-      }
-
-      // tokenize domain name and reverse. Also remove :port if it exists
-      String domain = tokens.get(0);
-      idx = domain.indexOf(':');
-      if (idx >= 0) {
-        domain = domain.substring(0, idx);
-      }
-      List<String> rev = reverse(tokenize(domain, "urn".equals(scheme) ? ".-" : "."));
-      if ("www".equalsIgnoreCase(rev.get(rev.size() - 1))) {
-        // remove leading www
-        rev.remove(rev.size() - 1);
-      }
-
-      // replace the domain name with tokenized items
-      tokens.addAll(1, rev);
-      tokens.remove(0);
-
-      // iterate through the tokens and apply xml->java name algorithm
-      for (int i = 0; i < tokens.size(); i++) {
-
-        // get the token and remove illegal chars
-        String token = tokens.get(i);
-        token = removeIllegalIdentifierChars(token);
-
-        // this will check for reserved keywords
-        if (SourceVersion.isKeyword(token.toLowerCase(Locale.ENGLISH))) {
-          token = '_' + token;
-        }
-
-        tokens.set(i, token.toLowerCase(Locale.ENGLISH));
-      }
-
-      // concat all the pieces and return it
-      return combine(tokens, '.');
-    }
-
-    private static String removeIllegalIdentifierChars(String token) {
-      StringBuilder newToken = new StringBuilder(token.length() * 2); // max expected length
-      for (int i = 0; i < token.length(); i++) {
-        char ch = token.charAt(i);
-        if (i == 0 && !Character.isJavaIdentifierStart(ch)) { // ch can't be used as FIRST char
-          newToken.append('_');
-        }
-        if (Character.isJavaIdentifierPart(ch)) {
-          newToken.append(ch); // ch is valid
-        } else {
-          newToken.append('_'); // ch can't be used
-        }
-      }
-      return newToken.toString();
-    }
-
-    private static List<String> tokenize(String str, String sep) {
-      StringTokenizer tokens = new StringTokenizer(str, sep);
-      List<String> retval = new ArrayList<>();
-
-      while (tokens.hasMoreTokens()) {
-        retval.add(tokens.nextToken());
-      }
-      return retval;
-    }
-
-    private static <T> List<T> reverse(List<T> list) {
-      List<T> rev = new ArrayList<>(list.size());
-
-      for (int i = list.size() - 1; i >= 0; i--) {
-        rev.add(list.get(i));
-      }
-      return rev;
-    }
-
-    private static String combine(List<String> tokens, char sep) {
-      StringBuilder buf = new StringBuilder(tokens.get(0));
-
-      for (int i = 1; i < tokens.size(); i++) {
-        buf.append(sep)
-            .append(tokens.get(i));
-      }
-      return buf.toString();
-    }
-  }
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/NameUtil.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/NameUtil.java
deleted file mode 100644
index c54f0d736..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/impl/NameUtil.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-/*
- * This code is based on https://github.com/eclipse-ee4j/jaxb-ri/blob/master/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/api/impl/NameUtil.java
- *
- * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-package gov.nist.secauto.metaschema.databind.codegen.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * Methods that convert strings into various formats.
- */
-@SuppressWarnings("PMD")
-class NameUtil {
-  protected static boolean isPunct(char ch) {
-    return ch == '-' || ch == '.' || ch == ':' || ch == '_' || ch == '·' || ch == '·' || ch == '۝' || ch == '۞';
-  }
-
-  /**
-   * Capitalizes the first character of the specified string, and de-capitalize
-   * the rest of characters.
-   *
-   * @param str
-   *          the string to capitalize
-   * @return the capitalized string
-   */
-  public static String capitalize(String str) {
-    if (!Character.isLowerCase(str.charAt(0))) {
-      return str;
-    }
-    StringBuilder sb = new StringBuilder(str.length());
-    sb.append(String.valueOf(str.charAt(0)).toUpperCase(Locale.ENGLISH));
-    sb.append(str.substring(1).toLowerCase(Locale.ENGLISH));
-    return sb.toString();
-  }
-
-  // Precondition: s[start] is not punctuation
-  @SuppressWarnings({
-      "checkstyle:MissingSwitchDefaultCheck", // intentional
-  })
-  private static int nextBreak(String str, int start) {
-    int len = str.length();
-
-    char c1 = str.charAt(start);
-    int t1 = classify(c1);
-
-    for (int i = start + 1; i < len; i++) {
-      // shift (c1,t1) into (c0,t0)
-      // char c0 = c1; --- conceptually, but c0 won't be used
-      int t0 = t1;
-
-      c1 = str.charAt(i);
-      t1 = classify(c1);
-
-      switch (actionTable[t0 * 5 + t1]) {
-      case ACTION_CHECK_PUNCT:
-        if (isPunct(c1)) {
-          return i;
-        }
-        break;
-      case ACTION_CHECK_C2:
-        if (i < len - 1) {
-          char c2 = str.charAt(i + 1);
-          if (Character.isLowerCase(c2)) {
-            return i;
-          }
-        }
-        break;
-      case ACTION_BREAK:
-        return i;
-      }
-    }
-    return -1;
-  }
-
-  // the 5-category classification that we use in this code
-  // to find work breaks
-  protected static final int UPPER_LETTER = 0;
-  protected static final int LOWER_LETTER = 1;
-  protected static final int OTHER_LETTER = 2;
-  protected static final int DIGIT = 3;
-  protected static final int OTHER = 4;
-
-  /**
-   * Look up table for actions. type0*5+type1 would yield the action to be taken.
-   */
-  private static final byte[] actionTable = new byte[5 * 5];
-
-  // action constants. see nextBreak for the meaning
-  private static final byte ACTION_CHECK_PUNCT = 0;
-  private static final byte ACTION_CHECK_C2 = 1;
-  private static final byte ACTION_BREAK = 2;
-  private static final byte ACTION_NOBREAK = 3;
-
-  /**
-   * Decide the action to be taken given the classification of the preceding
-   * character 't0' and the classification of the next character 't1'.
-   */
-  private static byte decideAction(int t0, int t1) {
-    if (t0 == OTHER && t1 == OTHER) {
-      return ACTION_CHECK_PUNCT;
-    }
-    if ((t0 == DIGIT) ^ (t1 == DIGIT)) {
-      return ACTION_BREAK;
-    }
-    if (t0 == LOWER_LETTER && t1 != LOWER_LETTER) {
-      return ACTION_BREAK;
-    }
-    if ((t0 <= OTHER_LETTER) ^ (t1 <= OTHER_LETTER)) {
-      return ACTION_BREAK;
-    }
-    if ((t0 == OTHER_LETTER) ^ (t1 == OTHER_LETTER)) {
-      return ACTION_BREAK;
-    }
-    if (t0 == UPPER_LETTER && t1 == UPPER_LETTER) {
-      return ACTION_CHECK_C2;
-    }
-
-    return ACTION_NOBREAK;
-  }
-
-  static {
-    // initialize the action table
-    for (int t0 = 0; t0 < 5; t0++) {
-      for (int t1 = 0; t1 < 5; t1++) {
-        actionTable[t0 * 5 + t1] = decideAction(t0, t1);
-      }
-    }
-  }
-
-  /**
-   * Classify a character into 5 categories that determine the word break.
-   *
-   * @param ch
-   *          the character
-   * @return the categorization
-   */
-  protected static int classify(char ch) {
-    switch (Character.getType(ch)) {
-    case Character.UPPERCASE_LETTER:
-      return UPPER_LETTER;
-    case Character.LOWERCASE_LETTER:
-      return LOWER_LETTER;
-    case Character.TITLECASE_LETTER:
-    case Character.MODIFIER_LETTER:
-    case Character.OTHER_LETTER:
-      return OTHER_LETTER;
-    case Character.DECIMAL_DIGIT_NUMBER:
-      return DIGIT;
-    default:
-      return OTHER;
-    }
-  }
-
-  /**
-   * Tokenizes a string into words and capitalizes the first character of each
-   * word.
-   * <p>
-   * This method uses a change in character type as a splitter of two words. For
-   * example, "abc100ghi" will be splitted into {"Abc", "100","Ghi"}.
-   *
-   * @param str
-   *          the string to split into a word list
-   * @return the word list
-   */
-  public static List<String> toWordList(String str) {
-    ArrayList<String> retval = new ArrayList<>();
-    int len = str.length();
-    for (int i = 0; i < len;) {
-
-      // Skip punctuation
-      while (i < len) {
-        if (!isPunct(str.charAt(i))) {
-          break;
-        }
-        i++;
-      }
-      if (i >= len) {
-        break;
-      }
-
-      // Find next break and collect word
-      int breakPos = nextBreak(str, i);
-      String word = (breakPos == -1) ? str.substring(i) : str.substring(i, breakPos);
-      retval.add(escape(capitalize(word)));
-      if (breakPos == -1) {
-        break;
-      }
-      i = breakPos;
-    }
-
-    // we can't guarantee a valid Java identifier anyway,
-    // so there's not much point in rejecting things in this way.
-    // if (ss.size() == 0)
-    // throw new IllegalArgumentException("Zero-length identifier");
-    return retval;
-  }
-
-  protected static String toMixedCaseName(List<String> ss, boolean startUpper) {
-    StringBuilder sb = new StringBuilder();
-    if (!ss.isEmpty()) {
-      sb.append(startUpper ? ss.get(0) : ss.get(0).toLowerCase(Locale.ENGLISH));
-      for (int i = 1; i < ss.size(); i++) {
-        sb.append(ss.get(i));
-      }
-    }
-    return sb.toString();
-  }
-
-  protected static String toMixedCaseVariableName(String[] ss,
-      boolean startUpper,
-      boolean cdrUpper) {
-    if (cdrUpper) {
-      for (int i = 1; i < ss.length; i++) {
-        ss[i] = capitalize(ss[i]);
-      }
-    }
-    StringBuilder sb = new StringBuilder();
-    if (ss.length > 0) {
-      sb.append(startUpper ? ss[0] : ss[0].toLowerCase(Locale.ENGLISH));
-      for (int i = 1; i < ss.length; i++) {
-        sb.append(ss[i]);
-      }
-    }
-    return sb.toString();
-  }
-
-  /**
-   * Formats a string into "THIS_KIND_OF_FORMAT_ABC_DEF".
-   *
-   * @param str
-   *          the string to format
-   * @return Always return a string but there's no guarantee that the generated
-   *         code is a valid Java identifier.
-   */
-  public String toConstantName(String str) {
-    return toConstantName(toWordList(str));
-  }
-
-  /**
-   * Formats a string into "THIS_KIND_OF_FORMAT_ABC_DEF".
-   *
-   * @param ss
-   *          a list of words
-   * @return Always return a string but there's no guarantee that the generated
-   *         code is a valid Java identifier.
-   */
-  public String toConstantName(List<String> ss) {
-    StringBuilder sb = new StringBuilder();
-    if (!ss.isEmpty()) {
-      sb.append(ss.get(0).toUpperCase(Locale.ENGLISH));
-      for (int i = 1; i < ss.size(); i++) {
-        sb.append('_');
-        sb.append(ss.get(i).toUpperCase(Locale.ENGLISH));
-      }
-    }
-    return sb.toString();
-  }
-
-  /**
-   * Escapes characters is the given string so that they can be printed by only
-   * using US-ASCII characters.
-   *
-   * The escaped characters will be appended to the given StringBuffer.
-   *
-   * @param sb
-   *          StringBuffer that receives escaped string.
-   * @param str
-   *          String to be escaped. <code>s.substring(start)</code> will be
-   *          escaped and copied to the string buffer.
-   * @param start
-   *          the starting position in the string
-   */
-  @SuppressWarnings({
-      "checkstyle:MissingSwitchDefaultCheck", // intentional
-      "checkstyle:AvoidEscapedUnicodeCharactersCheck" // ok
-  })
-  public static void escape(StringBuilder sb, String str, int start) {
-    int len = str.length();
-    for (int i = start; i < len; i++) {
-      char ch = str.charAt(i);
-      if (Character.isJavaIdentifierPart(ch)) {
-        sb.append(ch);
-      } else {
-        sb.append('_');
-        if (ch <= '\u000f') {
-          sb.append("000");
-        } else if (ch <= '\u00ff') {
-          sb.append("00");
-        } else if (ch <= '\u0fff') {
-          sb.append('0');
-        }
-        sb.append(Integer.toString(ch, 16));
-      }
-    }
-  }
-
-  /**
-   * Escapes characters that are unusable as Java identifiers by replacing unsafe
-   * characters with safe characters.
-   */
-  private static String escape(String str) {
-    int len = str.length();
-    for (int i = 0; i < len; i++) {
-      if (!Character.isJavaIdentifierPart(str.charAt(i))) {
-        StringBuilder sb = new StringBuilder(str.substring(0, i));
-        escape(sb, str, i);
-        return sb.toString();
-      }
-    }
-    return str;
-  }
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java
index 6e8ce7d63..fa31d23e8 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java
@@ -37,7 +37,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.lang.annotation.Annotation;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import javax.lang.model.element.Modifier;
@@ -83,7 +83,7 @@ public Set<IModelDefinition> generateMemberAnnotation(
 
     TypeInfoUtils.buildCommonBindingAnnotationValues(getInstance(), memberAnnotation);
 
-    Set<IModelDefinition> retval = new HashSet<>();
+    Set<IModelDefinition> retval = new LinkedHashSet<>();
 
     I instance = getInstance();
     IModelDefinition definition = getInstance().getDefinition();
@@ -106,7 +106,7 @@ public Set<IModelDefinition> generateMemberAnnotation(
 
       TypeSpec.Builder subClass = TypeSpec.classBuilder(itemTypeName);
       subClass.superclass(extendedClassName);
-      subClass.addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+      subClass.addModifiers(Modifier.PUBLIC, Modifier.STATIC); // , Modifier.FINAL);
       // subClass.addField(
       // FieldSpec.builder(String.class, "DISCRIMINATOR", Modifier.PUBLIC,
       // Modifier.STATIC, Modifier.FINAL)
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java
index dfeb9b82c..49f1ed448 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java
@@ -42,7 +42,7 @@
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo;
 import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -100,7 +100,7 @@ public String getBaseName() {
   public Set<IModelDefinition> buildField(
       TypeSpec.Builder typeBuilder,
       FieldSpec.Builder fieldBuilder) {
-    Set<IModelDefinition> retval = new HashSet<>(super.buildField(typeBuilder, fieldBuilder));
+    Set<IModelDefinition> retval = new LinkedHashSet<>(super.buildField(typeBuilder, fieldBuilder));
 
     AnnotationSpec.Builder annotation = newBindingAnnotation();
 
@@ -120,14 +120,7 @@ protected AnnotationSpec.Builder generateGroupAsAnnotation() {
     groupAsAnnoation.addMember("name", "$S",
         ObjectUtils.requireNonNull(modelInstance.getGroupAsName(), "The grouping name must be non-null"));
 
-    String groupAsNamespace = modelInstance.getGroupAsXmlNamespace();
-    if (groupAsNamespace == null) {
-      groupAsAnnoation.addMember("namespace", "$S", "##default");
-    } else if (groupAsNamespace.isEmpty()) {
-      groupAsAnnoation.addMember("namespace", "$S", "##none");
-    } else if (!modelInstance.getContainingModule().getXmlNamespace().toASCIIString().equals(groupAsNamespace)) {
-      groupAsAnnoation.addMember("namespace", "$S", groupAsNamespace);
-    } // otherwise use the ##default
+    // TODO: handle group-as namespace as a prefix
 
     JsonGroupAsBehavior jsonGroupAsBehavior = modelInstance.getJsonGroupAsBehavior();
     assert jsonGroupAsBehavior != null;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java
index de2a8f621..068c1d04e 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java
@@ -45,8 +45,8 @@
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo;
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo;
 
-import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.Set;
 
@@ -93,7 +93,7 @@ public Set<IModelDefinition> buildField(
 
     IModelDefinition definition = getInstance().getDefinition();
     if (definition.isInline() && (definition.hasChildren() || definition instanceof IAssemblyDefinition)) {
-      retval = new HashSet<>(retval);
+      retval = new LinkedHashSet<>(retval);
 
       // this is an inline definition that must be built as a child class
       retval.add(definition);
@@ -141,7 +141,7 @@ protected void buildExtraMethods(TypeSpec.Builder builder, FieldSpec valueField)
       String itemPropertyName = ClassUtils.toPropertyName(getItemBaseName());
 
       if (JsonGroupAsBehavior.KEYED.equals(instance.getJsonGroupAsBehavior())) {
-        IFlagInstance jsonKey = instance.getDefinition().getJsonKeyFlagInstance();
+        IFlagInstance jsonKey = instance.getDefinition().getJsonKey();
         if (jsonKey == null) {
           throw new IllegalStateException(
               String.format("JSON key not defined for property: %s", instance.toCoordinates()));
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java
index c859504ff..015e7fdbb 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java
@@ -41,8 +41,8 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundChoiceGroup;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -93,12 +93,12 @@ public Set<IModelDefinition> buildBindingAnnotation(
       annotation.addMember("maxOccurs", "$L", maxOccurs);
     }
 
-    String jsonKeyName = choiceGroup.getJsonKeyFlagName();
+    String jsonKeyName = choiceGroup.getJsonKeyFlagInstanceName();
     if (jsonKeyName != null) {
       annotation.addMember("jsonKey", "$S", jsonKeyName);
     }
 
-    Set<IModelDefinition> retval = new HashSet<>();
+    Set<IModelDefinition> retval = new LinkedHashSet<>();
 
     IAssemblyDefinitionTypeInfo parentTypeInfo = getParentTypeInfo();
     ITypeResolver typeResolver = parentTypeInfo.getTypeResolver();
@@ -124,52 +124,6 @@ public Set<IModelDefinition> buildBindingAnnotation(
           annotation,
           typeBuilder,
           referencedDefinitions.get(className).size() > 1));
-
-      // Class<?> groupedAnnotationType;
-      // if (modelInstance instanceof IFieldInstanceGrouped) {
-      // groupedAnnotationType = BoundGroupedField.class;
-      // } else if (modelInstance instanceof IAssemblyInstanceGrouped) {
-      // groupedAnnotationType = BoundGroupedAssembly.class;
-      // } else {
-      // throw new UnsupportedOperationException(String.format("Unsuported named model
-      // instance type '%s'.",
-      // instanceTypeInfo.getClass().getName()));
-      // }
-      // AnnotationSpec.Builder memberAnnotation =
-      // ObjectUtils.notNull(AnnotationSpec.builder(groupedAnnotationType));
-
-      // instanceTypeInfo.buildBindingAnnotationCommon(memberAnnotation);
-      //
-      // IContainerFlag definition = modelInstance.getDefinition();
-      // TypeName instanceTypeName;
-      // if (definition.isInline()) {
-      // retval.add(definition);
-      // instanceTypeName = typeResolver.getClassName(definition);
-      // } else {
-      // // build the definition
-      // throw new UnsupportedOperationException("implement");
-      // // ClassName extendedClassName = typeResolver.getClassName(definition);
-      // // ClassName parentClassName = getParentDefinitionTypeInfo().getClassName();
-      // // ClassName extendingClassName =
-      // typeResolver.getSubclassName(parentClassName,
-      // // definition, modelInstance);
-      // //
-      // // IModelDefinitionTypeInfo referencedClassTypeInfo =
-      // // typeResolver.getTypeInfo(definition);
-      // // typeResolver.getSubClassName(instanceTypeInfo, );
-      // // instanceTypeName = instanceTypeInfo.getJavaItemType();
-      // }
-      //
-      // memberAnnotation.addMember("binding", "$T.class",
-      // instanceTypeInfo.getJavaItemType());
-      //
-      // if (modelInstance instanceof IFieldInstanceGrouped) {
-      // annotation.addMember("fields", "$L",
-      // instanceTypeInfo.generateMemberAnnotation().build());
-      // } else if (modelInstance instanceof IAssemblyInstanceGrouped) {
-      // annotation.addMember("assemblies", "$L",
-      // instanceTypeInfo.generateMemberAnnotation().build());
-      // }
     }
 
     if (maxOccurs == -1 || maxOccurs > 1) {
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java
index 21e719c99..b60dfc86e 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java
@@ -31,28 +31,22 @@
 import com.squareup.javapoet.FieldSpec;
 import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterSpec;
 import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.WildcardTypeName;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
-import gov.nist.secauto.metaschema.core.model.IContainerFlag;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.IDefinition;
 import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
-import gov.nist.secauto.metaschema.core.model.IFlagInstance;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
-import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IModule;
-import gov.nist.secauto.metaschema.core.model.INamedModelInstance;
-import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
-import gov.nist.secauto.metaschema.databind.codegen.ClassUtils;
 import gov.nist.secauto.metaschema.databind.codegen.IGeneratedClass;
 import gov.nist.secauto.metaschema.databind.codegen.IGeneratedDefinitionClass;
 import gov.nist.secauto.metaschema.databind.codegen.IGeneratedModuleClass;
@@ -67,8 +61,8 @@
 import gov.nist.secauto.metaschema.databind.model.IBoundModule;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField;
+import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaPackage;
-import gov.nist.secauto.metaschema.databind.model.annotations.Module;
 import gov.nist.secauto.metaschema.databind.model.annotations.XmlNs;
 import gov.nist.secauto.metaschema.databind.model.annotations.XmlNsForm;
 import gov.nist.secauto.metaschema.databind.model.annotations.XmlSchema;
@@ -83,9 +77,7 @@
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -152,14 +144,14 @@ public IGeneratedModuleClass generateClass(
     Path classFile = ObjectUtils.notNull(javaFile.writeToPath(targetDirectory));
 
     // now generate all related definition classes
-    Stream<? extends IContainerFlag> globalDefinitions = Stream.concat(
+    Stream<? extends IModelDefinition> globalDefinitions = Stream.concat(
         module.getAssemblyDefinitions().stream(),
         module.getFieldDefinitions().stream());
 
-    Set<String> classNames = new HashSet<>();
+    Set<String> classNames = new LinkedHashSet<>();
 
     @SuppressWarnings("PMD.UseConcurrentHashMap") // map is unmodifiable
-    Map<IContainerFlag, IGeneratedDefinitionClass> definitionProductions
+    Map<IModelDefinition, IGeneratedDefinitionClass> definitionProductions
         = ObjectUtils.notNull(globalDefinitions
             // Get type information for assembly and field definitions.
             // Avoid field definitions without flags that don't require a generated class
@@ -275,11 +267,13 @@ protected TypeSpec.Builder newClassBuilder(
       @NonNull ClassName className) { // NOPMD - long, but readable
 
     // create the class
-    TypeSpec.Builder builder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC, Modifier.FINAL);
+    TypeSpec.Builder builder = TypeSpec.classBuilder(className)
+        .addModifiers(Modifier.PUBLIC)
+        .addModifiers(Modifier.FINAL);
 
     builder.superclass(AbstractBoundModule.class);
 
-    AnnotationSpec.Builder moduleAnnotation = AnnotationSpec.builder(Module.class);
+    AnnotationSpec.Builder moduleAnnotation = AnnotationSpec.builder(MetaschemaModule.class);
 
     ITypeResolver typeResolver = getTypeResolver();
     for (IFieldDefinition definition : module.getFieldDefinitions()) {
@@ -428,17 +422,48 @@ protected TypeSpec.Builder newClassBuilder(
       @NonNull IModelDefinitionTypeInfo typeInfo,
       boolean isChild) throws IOException {
     // create the class
-    TypeSpec.Builder builder = TypeSpec.classBuilder(typeInfo.getClassName()).addModifiers(Modifier.PUBLIC);
+    TypeSpec.Builder builder = TypeSpec.classBuilder(typeInfo.getClassName())
+        .addModifiers(Modifier.PUBLIC);
     assert builder != null;
     if (isChild) {
       builder.addModifiers(Modifier.STATIC);
     }
+    // builder.addModifiers(Modifier.FINAL);
+
+    builder.addSuperinterface(ClassName.get(IBoundObject.class));
+
+    // add field for Metaschema info
+    builder.addField(FieldSpec.builder(IMetaschemaData.class, "__metaschemaData", Modifier.PRIVATE, Modifier.FINAL)
+        .build());
+
+    builder.addMethod(MethodSpec.constructorBuilder()
+        .addModifiers(Modifier.PUBLIC)
+        .addStatement("this(null)")
+        .build());
+
+    builder.addMethod(MethodSpec.constructorBuilder()
+        .addModifiers(Modifier.PUBLIC)
+        .addParameter(IMetaschemaData.class, "data")
+        .addStatement("this.$N = $N", "__metaschemaData", "data")
+        .build());
+
+    // generate a toString method that will help with debugging
+    MethodSpec.Builder getMetaschemaData = MethodSpec.methodBuilder("getMetaschemaData")
+        .addModifiers(Modifier.PUBLIC)
+        .returns(IMetaschemaData.class)
+        .addAnnotation(Override.class)
+        .addStatement("return __metaschemaData");
+    builder.addMethod(getMetaschemaData.build());
 
     ClassName baseClassName = typeInfo.getBaseClassName();
     if (baseClassName != null) {
       builder.superclass(baseClassName);
     }
 
+    for (ClassName superinterface : typeInfo.getSuperinterfaces()) {
+      builder.addSuperinterface(superinterface);
+    }
+
     Set<IModelDefinition> additionalChildClasses;
     if (typeInfo instanceof IAssemblyDefinitionTypeInfo) {
       additionalChildClasses = buildClass((IAssemblyDefinitionTypeInfo) typeInfo, builder);
@@ -474,10 +499,6 @@ protected TypeSpec.Builder newClassBuilder(
   protected Set<IModelDefinition> buildClass(
       @NonNull IAssemblyDefinitionTypeInfo typeInfo,
       @NonNull TypeSpec.Builder builder) {
-    Set<IModelDefinition> retval = new HashSet<>();
-
-    retval.addAll(buildClass((IModelDefinitionTypeInfo) typeInfo, builder));
-
     AnnotationSpec.Builder metaschemaAssembly = ObjectUtils.notNull(AnnotationSpec.builder(MetaschemaAssembly.class));
 
     buildCommonProperties(typeInfo, metaschemaAssembly);
@@ -496,7 +517,8 @@ protected Set<IModelDefinition> buildClass(
     AnnotationGenerator.buildAssemblyConstraints(metaschemaAssembly, definition);
 
     builder.addAnnotation(metaschemaAssembly.build());
-    return retval;
+
+    return new LinkedHashSet<>(buildClass((IModelDefinitionTypeInfo) typeInfo, builder));
   }
 
   /**
@@ -513,9 +535,6 @@ protected Set<IModelDefinition> buildClass(
   protected Set<IModelDefinition> buildClass(
       @NonNull IFieldDefinitionTypeInfo typeInfo,
       @NonNull TypeSpec.Builder builder) {
-    Set<IModelDefinition> retval = new HashSet<>();
-    retval.addAll(buildClass((IModelDefinitionTypeInfo) typeInfo, builder));
-
     AnnotationSpec.Builder metaschemaField = ObjectUtils.notNull(AnnotationSpec.builder(MetaschemaField.class));
 
     buildCommonProperties(typeInfo, metaschemaField);
@@ -524,7 +543,8 @@ protected Set<IModelDefinition> buildClass(
     AnnotationGenerator.buildValueConstraints(metaschemaField, definition);
 
     builder.addAnnotation(metaschemaField.build());
-    return retval;
+
+    return new LinkedHashSet<>(buildClass((IModelDefinitionTypeInfo) typeInfo, builder));
   }
 
   /**
@@ -547,7 +567,7 @@ protected Set<IModelDefinition> buildClass(
       builder.addJavadoc(description.toHtml());
     }
 
-    Set<IModelDefinition> additionalChildClasses = new HashSet<>();
+    Set<IModelDefinition> additionalChildClasses = new LinkedHashSet<>();
 
     // // generate a no-arg constructor
     // builder.addMethod(MethodSpec.constructorBuilder().addModifiers(Modifier.PUBLIC).build());
@@ -604,162 +624,4 @@ protected void buildCommonProperties(
     IModule module = definition.getContainingModule();
     builder.addMember("moduleClass", "$T.class", getTypeResolver().getClassName(module));
   }
-
-  /*
-  protected void buildFieldForFieldValue(
-      @NonNull IFieldValueTypeInfo typeInfo,
-      @NonNull FieldSpec.Builder builder) {
-    IFieldDefinition definition = typeInfo.getParentDefinitionTypeInfo().getDefinition();
-    AnnotationSpec.Builder fieldValue = AnnotationSpec.builder(BoundFieldValue.class);
-
-    IDataTypeAdapter<?> valueDataType = definition.getJavaTypeAdapter();
-
-    // a field object always has a single value
-    if (!definition.hasJsonValueKeyFlagInstance()) {
-      fieldValue.addMember("valueKeyName", "$S", definition.getJsonValueKeyName());
-    } // else do nothing, the annotation will be on the flag
-
-    if (!MetaschemaDataTypeProvider.DEFAULT_DATA_TYPE.equals(valueDataType)) {
-      fieldValue.addMember("typeAdapter", "$T.class", valueDataType.getClass());
-    }
-
-    Object defaultValue = definition.getDefaultValue();
-    if (defaultValue != null) {
-      fieldValue.addMember("defaultValue", "$S", valueDataType.asString(defaultValue));
-    }
-
-    builder.addAnnotation(fieldValue.build());
-  }
-  */
-  /**
-   * This method can be implemented by subclasses to create additional methods.
-   *
-   * @param typeInfo
-   *          the type information for the Java property to build
-   * @param builder
-   *          the class builder
-   * @param valueField
-   *          the field corresponding to this property
-   */
-  @SuppressWarnings("PMD.LooseCoupling") // need implementation classes
-  protected void buildExtraMethods( // NOPMD - intentional
-      @NonNull IModelInstanceTypeInfo typeInfo,
-      @NonNull TypeSpec.Builder builder,
-      @NonNull FieldSpec valueField) {
-    IModelInstanceAbsolute instance = typeInfo.getInstance();
-    int maxOccurance = instance.getMaxOccurs();
-    if (maxOccurance == -1 || maxOccurance > 1) {
-      TypeName itemType = typeInfo.getJavaItemType();
-      ParameterSpec valueParam = ObjectUtils.notNull(ParameterSpec.builder(itemType, "item").build());
-
-      String itemPropertyName = ClassUtils.toPropertyName(typeInfo.getItemBaseName());
-
-      if (JsonGroupAsBehavior.KEYED.equals(instance.getJsonGroupAsBehavior())) {
-        if (instance instanceof INamedModelInstance) {
-          buildKeyedMethods((INamedModelInstance) instance, builder, itemType, itemPropertyName, valueParam,
-              valueField);
-        } else {
-          // FIXME: implement choice group
-          throw new UnsupportedOperationException("implement");
-        }
-      } else {
-        {
-          // create add method
-          MethodSpec.Builder method = MethodSpec.methodBuilder("add" + itemPropertyName)
-              .addParameter(valueParam)
-              .returns(TypeName.BOOLEAN)
-              .addModifiers(Modifier.PUBLIC)
-              .addJavadoc("Add a new {@link $T} item to the underlying collection.\n", itemType)
-              .addJavadoc("@param item the item to add\n")
-              .addJavadoc("@return {@code true}\n")
-              .addStatement("$T value = $T.requireNonNull($N,\"$N cannot be null\")",
-                  itemType, ObjectUtils.class, valueParam, valueParam)
-              .beginControlFlow("if ($N == null)", valueField)
-              .addStatement("$N = new $T<>()", valueField, LinkedList.class)
-              .endControlFlow()
-              .addStatement("return $N.add(value)", valueField);
-
-          builder.addMethod(method.build());
-        }
-
-        {
-          // create remove method
-          MethodSpec.Builder method = MethodSpec.methodBuilder("remove" + itemPropertyName)
-              .addParameter(valueParam)
-              .returns(TypeName.BOOLEAN)
-              .addModifiers(Modifier.PUBLIC)
-              .addJavadoc("Remove the first matching {@link $T} item from the underlying collection.\n", itemType)
-              .addJavadoc("@param item the item to remove\n")
-              .addJavadoc("@return {@code true} if the item was removed or {@code false} otherwise\n")
-              .addStatement("$T value = $T.requireNonNull($N,\"$N cannot be null\")",
-                  itemType, ObjectUtils.class, valueParam, valueParam)
-              .addStatement("return $1N != null && $1N.remove(value)", valueField);
-          builder.addMethod(method.build());
-        }
-      }
-    }
-  }
-
-  private void buildKeyedMethods(
-      @NonNull INamedModelInstance instance,
-      @NonNull TypeSpec.Builder builder,
-      @NonNull TypeName itemType,
-      @NonNull String itemPropertyName,
-      @NonNull ParameterSpec valueParam,
-      @NonNull FieldSpec valueField) {
-
-    IFlagInstance jsonKey = instance.getDefinition().getJsonKeyFlagInstance();
-    if (jsonKey == null) {
-      throw new IllegalStateException(
-          String.format("JSON key not defined for property: %s", instance.toCoordinates()));
-    }
-
-    // get the json key property on the instance's definition
-    IModelDefinitionTypeInfo instanceTypeInfo = typeResolver.getTypeInfo(instance.getDefinition());
-    IFlagInstanceTypeInfo jsonKeyTypeInfo = instanceTypeInfo.getFlagInstanceTypeInfo(jsonKey);
-
-    if (jsonKeyTypeInfo == null) {
-      throw new IllegalStateException(
-          String.format("Unable to identify JSON key for property: %s", instance.toCoordinates()));
-    }
-
-    {
-      // create add method
-      MethodSpec.Builder method = MethodSpec.methodBuilder("add" + itemPropertyName)
-          .addParameter(valueParam)
-          .returns(itemType)
-          .addModifiers(Modifier.PUBLIC)
-          .addJavadoc("Add a new {@link $T} item to the underlying collection.\n", itemType)
-          .addJavadoc("@param item the item to add\n")
-          .addJavadoc("@return the existing {@link $T} item in the collection or {@code null} if not item exists\n",
-              itemType)
-          .addStatement("$1T value = $2T.requireNonNull($3N,\"$3N value cannot be null\")",
-              itemType, ObjectUtils.class, valueParam)
-          .addStatement("$1T key = $2T.requireNonNull($3N.$4N(),\"$3N key cannot be null\")",
-              String.class, ObjectUtils.class, valueParam, "get" + jsonKeyTypeInfo.getPropertyName())
-          .beginControlFlow("if ($N == null)", valueField)
-          .addStatement("$N = new $T<>()", valueField, LinkedHashMap.class) // NOPMD required
-          .endControlFlow()
-          .addStatement("return $N.put(key, value)", valueField);
-
-      builder.addMethod(method.build());
-    }
-    {
-      // create remove method
-      MethodSpec.Builder method = MethodSpec.methodBuilder("remove" + itemPropertyName)
-          .addParameter(valueParam)
-          .returns(TypeName.BOOLEAN)
-          .addModifiers(Modifier.PUBLIC)
-          .addJavadoc("Remove the {@link $T} item from the underlying collection.\n", itemType)
-          .addJavadoc("@param item the item to remove\n")
-          .addJavadoc("@return {@code true} if the item was removed or {@code false} otherwise\n")
-          .addStatement("$1T value = $2T.requireNonNull($3N,\"$3N value cannot be null\")",
-              itemType, ObjectUtils.class, valueParam)
-          .addStatement("$1T key = $2T.requireNonNull($3N.$4N(),\"$3N key cannot be null\")",
-              String.class, ObjectUtils.class, valueParam, "get" + jsonKeyTypeInfo.getPropertyName())
-          .addStatement("return $1N != null && $1N.remove(key, value)", valueField);
-      builder.addMethod(method.build());
-    }
-
-  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java
index ffb510d78..18a5df87e 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java
@@ -51,9 +51,12 @@
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -84,7 +87,7 @@ protected IBindingConfiguration getBindingConfiguration() {
   public IAssemblyDefinitionTypeInfo getTypeInfo(@NonNull IAssemblyDefinition definition) {
     return ObjectUtils.notNull(assemblyDefinitionToTypeInfoMap.computeIfAbsent(
         definition,
-        (def) -> IAssemblyDefinitionTypeInfo.newTypeInfo(ObjectUtils.notNull(def),
+        def -> IAssemblyDefinitionTypeInfo.newTypeInfo(ObjectUtils.notNull(def),
             this)));
   }
 
@@ -92,7 +95,7 @@ public IAssemblyDefinitionTypeInfo getTypeInfo(@NonNull IAssemblyDefinition defi
   public IFieldDefinitionTypeInfo getTypeInfo(@NonNull IFieldDefinition definition) {
     return ObjectUtils.notNull(fieldDefinitionToTypeInfoMap.computeIfAbsent(
         definition,
-        (def) -> IFieldDefinitionTypeInfo.newTypeInfo(ObjectUtils.notNull(def),
+        def -> IFieldDefinitionTypeInfo.newTypeInfo(ObjectUtils.notNull(def),
             this)));
   }
 
@@ -176,7 +179,7 @@ public ClassName getSubclassName(
   public ClassName getClassName(@NonNull IModelDefinition definition) {
     return ObjectUtils.notNull(definitionToTypeMap.computeIfAbsent(
         definition,
-        (def) -> {
+        def -> {
           String packageName = getBindingConfiguration().getPackageNameForModule(def.getContainingModule());
           String suggestedClassName = getBindingConfiguration().getClassName(definition);
           return getFlagContainerClassName(def, packageName, suggestedClassName);
@@ -198,7 +201,7 @@ public ClassName getClassName(IChoiceGroupInstance instance) {
   public ClassName getClassName(IModule module) {
     return ObjectUtils.notNull(moduleToTypeMap.computeIfAbsent(
         module,
-        (mod) -> {
+        mod -> {
           assert mod != null;
           String packageName = getBindingConfiguration().getPackageNameForModule(mod);
           String className = getBindingConfiguration().getClassName(mod);
@@ -216,7 +219,7 @@ public ClassName getClassName(IModule module) {
   protected Set<String> getClassNamesFor(@NonNull String packageOrTypeName) {
     return ObjectUtils.notNull(packageToClassNamesMap.computeIfAbsent(
         packageOrTypeName,
-        (pkg) -> Collections.synchronizedSet(new HashSet<>())));
+        pkg -> Collections.synchronizedSet(new LinkedHashSet<>())));
   }
 
   protected boolean isClassNameClash(@NonNull String packageOrTypeName, @NonNull String className) {
@@ -271,6 +274,14 @@ public ClassName getBaseClassName(IModelDefinition definition) {
     return retval;
   }
 
+  @Override
+  public List<ClassName> getSuperinterfaces(IModelDefinition definition) {
+    List<String> classNames = bindingConfiguration.getQualifiedSuperinterfaceClassNames(definition);
+    return ObjectUtils.notNull(classNames.stream()
+        .map(ClassName::bestGuess)
+        .collect(Collectors.toUnmodifiableList()));
+  }
+
   @Override
   public String getPackageName(@NonNull IModule module) {
     return bindingConfiguration.getPackageNameForModule(module);
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java
index 9ff2cf4f8..1896bc37d 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java
@@ -46,7 +46,6 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.JsonFieldValueKeyFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.JsonKey;
-import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
 
 import java.util.Set;
 
@@ -97,13 +96,7 @@ public Set<IModelDefinition> buildField(
       annotation.addMember("useIndex", "$L", index);
     }
 
-    String namespace = instance.getXmlNamespace();
-    if (namespace != null) {
-      if (namespace.equals(instance.getContainingModule().getXmlNamespace().toASCIIString())) {
-        namespace = ModelUtil.DEFAULT_STRING_VALUE;
-      }
-      annotation.addMember("namespace", "$S", namespace);
-    }
+    // TODO: handle flag namespace as a prefix
 
     IFlagDefinition definition = instance.getDefinition();
 
@@ -128,7 +121,8 @@ public Set<IModelDefinition> buildField(
     fieldBuilder.addAnnotation(annotation.build());
 
     IModelDefinition parent = instance.getContainingDefinition();
-    if (parent.hasJsonKey() && instance.equals(parent.getJsonKeyFlagInstance())) {
+    IFlagInstance jsonKey = parent.getJsonKey();
+    if (instance.equals(jsonKey)) {
       fieldBuilder.addAnnotation(JsonKey.class);
     }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ITypeResolver.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ITypeResolver.java
index bdb70e038..9b8296f7b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ITypeResolver.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/ITypeResolver.java
@@ -44,6 +44,8 @@
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo;
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo;
 
+import java.util.List;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -177,6 +179,17 @@ IGroupedNamedModelInstanceTypeInfo getTypeInfo(
   @NonNull
   ClassName getClassName(@NonNull INamedModelInstanceTypeInfo typeInfo);
 
+  /**
+   * Get the name of the super interfaces associated with the provided Metaschema
+   * definition.
+   *
+   * @param definition
+   *          the Metaschema definition to get the super ineterfaces for
+   * @return the super interface information for the definition
+   */
+  @NonNull
+  List<ClassName> getSuperinterfaces(@NonNull IModelDefinition definition);
+
   /**
    * Get the name of the class associated with the provided Metaschema definition
    * using the provided {@code postfix}. This class will be a child of the
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java
index 3bf50e2a5..5a3f9491c 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java
@@ -31,7 +31,6 @@
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.model.INamedModelInstance;
-import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -61,17 +60,11 @@ public static void buildCommonBindingAnnotationValues(
       annotation.addMember("useIndex", "$L", index);
     }
 
-    String namespace = instance.getXmlNamespace();
-    if (namespace == null) {
-      annotation.addMember("namespace", "$S", ModelUtil.NO_STRING_VALUE);
-    } else if (!instance.getContainingModule().getXmlNamespace().toASCIIString().equals(namespace)) {
-      annotation.addMember("namespace", "$S", namespace);
-    } // otherwise use the ##default
+    // TODO: handle instance namespace as a prefix
 
     MarkupMultiline remarks = instance.getRemarks();
     if (remarks != null) {
       annotation.addMember("remarks", "$S", remarks.toMarkdown());
     }
   }
-
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java
index c820d07ca..18126a687 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java
@@ -37,6 +37,7 @@
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IFlagInstanceTypeInfo;
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo;
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo;
+import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeInfo;
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver;
 
 import org.apache.logging.log4j.LogManager;
@@ -44,6 +45,7 @@
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -62,6 +64,9 @@ public abstract class AbstractModelDefinitionTypeInfo<DEF extends IModelDefiniti
   private final ClassName className;
   @Nullable
   private final ClassName baseClassName;
+  @NonNull
+  private final List<ClassName> superinterfaces;
+  @NonNull
   private final Lazy<Map<String, IFlagInstanceTypeInfo>> flagTypeInfos;
 
   public AbstractModelDefinitionTypeInfo(
@@ -71,10 +76,11 @@ public AbstractModelDefinitionTypeInfo(
     this.typeResolver = typeResolver;
     this.className = typeResolver.getClassName(definition);
     this.baseClassName = typeResolver.getBaseClassName(definition);
+    this.superinterfaces = typeResolver.getSuperinterfaces(definition);
     this.flagTypeInfos = ObjectUtils.notNull(Lazy.lazy(() -> flags()
         .collect(CustomCollectors.toMap(
-            (typeInfo) -> typeInfo.getPropertyName(),
-            (typeInfo) -> typeInfo,
+            ITypeInfo::getPropertyName,
+            CustomCollectors.identity(),
             (key, v1, v2) -> {
               if (LOGGER.isErrorEnabled()) {
                 LOGGER.error(String.format("Unexpected duplicate flag property name '%s'", key));
@@ -104,6 +110,11 @@ public ClassName getBaseClassName() {
     return baseClassName;
   }
 
+  @Override
+  public List<ClassName> getSuperinterfaces() {
+    return superinterfaces;
+  }
+
   private Stream<IFlagInstanceTypeInfo> flags() {
     return getDefinition().getFlagInstances().stream()
         .map(instance -> {
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java
index 1ff07d649..77a361849 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java
@@ -45,6 +45,7 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -67,8 +68,8 @@ public AssemblyDefinitionTypeInfoImpl(@NonNull IAssemblyDefinition definition, @
         getFlagInstanceTypeInfos().stream(),
         processModel(definition))
         .collect(CustomCollectors.toMap(
-            (typeInfo) -> typeInfo.getInstance(),
-            (typeInfo) -> typeInfo,
+            IInstanceTypeInfo::getInstance,
+            CustomCollectors.identity(),
             (key, v1, v2) -> {
               if (LOGGER.isErrorEnabled()) {
                 LOGGER.error(String.format("Unexpected duplicate property name '%s'", key));
@@ -78,8 +79,8 @@ public AssemblyDefinitionTypeInfoImpl(@NonNull IAssemblyDefinition definition, @
             LinkedHashMap::new))));
     this.propertyNameToTypeInfoMap = ObjectUtils.notNull(Lazy.lazy(() -> getInstanceTypeInfoMap().values().stream()
         .collect(Collectors.toMap(
-            (typeInfo) -> typeInfo.getPropertyName(),
-            (typeInfo) -> typeInfo,
+            IInstanceTypeInfo::getPropertyName,
+            Function.identity(),
             (v1, v2) -> v2,
             LinkedHashMap::new))));
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java
index 04573b260..078c00ac3 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java
@@ -31,6 +31,7 @@
 import gov.nist.secauto.metaschema.core.util.CustomCollectors;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IFieldValueTypeInfo;
+import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IFlagInstanceTypeInfo;
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo;
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo;
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver;
@@ -40,6 +41,7 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -60,8 +62,8 @@ public FieldDefinitionTypeInfoImpl(@NonNull IFieldDefinition definition, @NonNul
     super(definition, typeResolver);
     this.instanceToTypeInfoMap = ObjectUtils.notNull(Lazy.lazy(() -> getFlagInstanceTypeInfos().stream()
         .collect(CustomCollectors.toMap(
-            (typeInfo) -> typeInfo.getInstance(),
-            (typeInfo) -> typeInfo,
+            IFlagInstanceTypeInfo::getInstance,
+            CustomCollectors.identity(),
             (key, v1, v2) -> {
               if (LOGGER.isErrorEnabled()) {
                 LOGGER.error(String.format("Unexpected duplicate property name '%s'", key));
@@ -73,8 +75,8 @@ public FieldDefinitionTypeInfoImpl(@NonNull IFieldDefinition definition, @NonNul
         getInstanceTypeInfoMap().values().stream(),
         Stream.of((IPropertyTypeInfo) IFieldValueTypeInfo.newTypeInfo(this)))
         .collect(Collectors.toMap(
-            (typeInfo) -> typeInfo.getPropertyName(),
-            (typeInfo) -> typeInfo,
+            IPropertyTypeInfo::getPropertyName,
+            Function.identity(),
             (v1, v2) -> v2,
             LinkedHashMap::new))));
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java
index 914092caa..4331dd670 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java
@@ -36,6 +36,7 @@
 import gov.nist.secauto.metaschema.databind.codegen.typeinfo.ITypeResolver;
 
 import java.util.Collection;
+import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -90,6 +91,15 @@ static IModelDefinitionTypeInfo newTypeInfo(
   @NonNull
   ClassName getClassName();
 
+  /**
+   * Get the list of super interfaces the class must implement for the object
+   * definition for which this class is being generated.
+   *
+   * @return a list of super interfaces to implement
+   */
+  @NonNull
+  List<ClassName> getSuperinterfaces();
+
   /**
    * Get the type information for the provided {@code instance} value.
    *
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractDeserializer.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractDeserializer.java
index 7364ed274..7961b697d 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractDeserializer.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractDeserializer.java
@@ -31,6 +31,7 @@
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.StaticContext;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.constraint.DefaultConstraintValidator;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidationHandler;
 import gov.nist.secauto.metaschema.core.model.constraint.LoggingConstraintValidationHandler;
@@ -49,7 +50,7 @@
  * @param <CLASS>
  *          the bound class to deserialize to
  */
-public abstract class AbstractDeserializer<CLASS>
+public abstract class AbstractDeserializer<CLASS extends IBoundObject>
     extends AbstractSerializationBase<DeserializationFeature<?>>
     implements IDeserializer<CLASS> {
 
@@ -101,7 +102,10 @@ public INodeItem deserializeToNodeItem(Reader reader, URI documentUri) throws IO
     }
 
     if (isValidating()) {
-      DynamicContext dynamicContext = StaticContext.instance().dynamicContext();
+      DynamicContext dynamicContext = new DynamicContext(
+          StaticContext.builder()
+              .defaultModelNamespace(nodeItem.getNamespace())
+              .build());
       dynamicContext.setDocumentLoader(getBindingContext().newBoundLoader());
       DefaultConstraintValidator validator = new DefaultConstraintValidator(getConstraintValidationHandler());
       validator.validate(nodeItem, dynamicContext);
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractProblemHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractProblemHandler.java
index e7ce0addb..494dadfee 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractProblemHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractProblemHandler.java
@@ -26,7 +26,8 @@
 
 package gov.nist.secauto.metaschema.databind.io;
 
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundProperty;
 
 import java.io.IOException;
@@ -38,9 +39,9 @@ public abstract class AbstractProblemHandler implements IProblemHandler {
 
   @Override
   public void handleMissingInstances(
-      IBoundDefinitionModel parentDefinition,
-      Object targetObject,
-      Collection<? extends IBoundProperty> unhandledInstances) throws IOException {
+      IBoundDefinitionModelComplex parentDefinition,
+      IBoundObject targetObject,
+      Collection<? extends IBoundProperty<?>> unhandledInstances) throws IOException {
     applyDefaults(targetObject, unhandledInstances);
   }
 
@@ -58,8 +59,8 @@ public void handleMissingInstances(
    */
   protected static void applyDefaults(
       @NonNull Object targetObject,
-      @NonNull Collection<? extends IBoundProperty> unhandledInstances) throws IOException {
-    for (IBoundProperty instance : unhandledInstances) {
+      @NonNull Collection<? extends IBoundProperty<?>> unhandledInstances) throws IOException {
+    for (IBoundProperty<?> instance : unhandledInstances) {
       Object value = instance.getResolvedDefaultValue();
       if (value != null) {
         instance.setValue(targetObject, value);
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractSerializer.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractSerializer.java
index 7ce6af7b1..5046aa386 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractSerializer.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/AbstractSerializer.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.configuration.IConfiguration;
 import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -38,7 +39,7 @@
  * @param <CLASS>
  *          the bound class to serialize from
  */
-public abstract class AbstractSerializer<CLASS>
+public abstract class AbstractSerializer<CLASS extends IBoundObject>
     extends AbstractSerializationBase<SerializationFeature<?>>
     implements ISerializer<CLASS> {
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/BindingException.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/BindingException.java
index 2b1b069c8..3901924c2 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/BindingException.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/BindingException.java
@@ -1,77 +1,77 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.io;
-
-/**
- * Used to report exceptional conditions related to processing bound objects.
- */
-public class BindingException
-    extends Exception {
-
-  /**
-   * The serial version UID.
-   */
-  private static final long serialVersionUID = 1L;
-
-  // public BindingException(String message, Throwable cause, boolean
-  // enableSuppression, boolean writableStackTrace) {
-  // super(message, cause, enableSuppression, writableStackTrace);
-  // }
-
-  /**
-   * Construct a new binding exception with the provided detail message and cause.
-   *
-   * @param message
-   *          the detail message
-   * @param cause
-   *          the cause of the exception
-   */
-  public BindingException(String message, Throwable cause) {
-    super(message, cause);
-  }
-
-  /**
-   * Construct a new binding exception with the provided detail message.
-   *
-   * @param message
-   *          the detail message
-   */
-  public BindingException(String message) {
-    super(message);
-  }
-
-  /**
-   * Construct a new binding exception with the provided cause.
-   *
-   * @param cause
-   *          the cause of the exception
-   */
-  public BindingException(Throwable cause) {
-    super(cause);
-  }
-
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.io;
+
+/**
+ * Used to report exceptional conditions related to processing bound objects.
+ */
+public class BindingException
+    extends Exception {
+
+  /**
+   * The serial version UID.
+   */
+  private static final long serialVersionUID = 1L;
+
+  // public BindingException(String message, Throwable cause, boolean
+  // enableSuppression, boolean writableStackTrace) {
+  // super(message, cause, enableSuppression, writableStackTrace);
+  // }
+
+  /**
+   * Construct a new binding exception with the provided detail message and cause.
+   *
+   * @param message
+   *          the detail message
+   * @param cause
+   *          the cause of the exception
+   */
+  public BindingException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  /**
+   * Construct a new binding exception with the provided detail message.
+   *
+   * @param message
+   *          the detail message
+   */
+  public BindingException(String message) {
+    super(message);
+  }
+
+  /**
+   * Construct a new binding exception with the provided cause.
+   *
+   * @param cause
+   *          the cause of the exception
+   */
+  public BindingException(Throwable cause) {
+    super(cause);
+  }
+
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/DefaultBoundLoader.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/DefaultBoundLoader.java
index 070648c81..98c8314c3 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/DefaultBoundLoader.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/DefaultBoundLoader.java
@@ -31,9 +31,14 @@
 import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.resource.AbstractResourceResolver;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
+import gov.nist.secauto.metaschema.databind.io.ModelDetector.Result;
+
+import org.eclipse.jdt.annotation.NotOwning;
+import org.eclipse.jdt.annotation.Owning;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -119,12 +124,12 @@ public IBindingContext getBindingContext() {
   }
 
   @Override
-  public FormatDetector.Result detectFormat(@NonNull URI uri) throws IOException {
+  public Format detectFormat(@NonNull URI uri) throws IOException {
     URI resourceUri = resolve(uri);
     URL resource = resourceUri.toURL();
 
     try (InputStream is = ObjectUtils.notNull(resource.openStream())) {
-      return detectFormat(is);
+      return detectFormat(is).getFormat();
     }
   }
 
@@ -154,7 +159,13 @@ private ModelDetector getModelDetector() {
   }
 
   @Override
-  public <CLASS> CLASS load(@NonNull URI uri) throws IOException {
+  @Owning
+  public Result detectModel(@NotOwning InputStream is, Format format) throws IOException {
+    return getModelDetector().detect(is, format);
+  }
+
+  @Override
+  public <CLASS extends IBoundObject> CLASS load(@NonNull URI uri) throws IOException {
     URI resourceUri = resolve(uri);
     URL resource = resourceUri.toURL();
 
@@ -165,13 +176,13 @@ public <CLASS> CLASS load(@NonNull URI uri) throws IOException {
 
   @Override
   @NonNull
-  public <CLASS> CLASS load(@NonNull InputStream is, @NonNull URI documentUri) throws IOException {
+  public <CLASS extends IBoundObject> CLASS load(@NonNull InputStream is, @NonNull URI documentUri) throws IOException {
     // TODO: avoid node item
     return INodeItem.toValue(loadAsNodeItem(is, documentUri));
   }
 
   @Override
-  public <CLASS> CLASS load(Class<CLASS> clazz, URI uri) throws IOException {
+  public <CLASS extends IBoundObject> CLASS load(Class<CLASS> clazz, URI uri) throws IOException {
     URI resourceUri = resolve(uri);
     URL resource = resourceUri.toURL();
 
@@ -181,7 +192,8 @@ public <CLASS> CLASS load(Class<CLASS> clazz, URI uri) throws IOException {
   }
 
   @Override
-  public <CLASS> CLASS load(Class<CLASS> clazz, InputStream is, URI documentUri) throws IOException {
+  public <CLASS extends IBoundObject> CLASS load(Class<CLASS> clazz, InputStream is, URI documentUri)
+      throws IOException {
     // we cannot close this stream, since it will cause the underlying stream to be
     // closed
     FormatDetector.Result match = getFormatDetector().detect(is);
@@ -193,8 +205,9 @@ public <CLASS> CLASS load(Class<CLASS> clazz, InputStream is, URI documentUri) t
     }
   }
 
+  @Override
   @NonNull
-  private <CLASS> CLASS load(
+  public <CLASS extends IBoundObject> CLASS load(
       @NonNull Class<CLASS> clazz,
       @NonNull Format format,
       @NonNull InputStream is,
@@ -235,20 +248,22 @@ public IDocumentNodeItem loadAsNodeItem(Format format, URI uri) throws IOExcepti
   }
 
   @Override
-  public IDocumentNodeItem loadAsNodeItem(Format format, InputStream is, URI documentUri) throws IOException {
-    ModelDetector.Result modelMatch = getModelDetector().detect(is, format);
-
-    IDeserializer<?> deserializer = getDeserializer(
-        modelMatch.getBoundClass(),
-        format,
-        getConfiguration());
-    try (InputStream modelStream = modelMatch.getDataStream()) {
-      return (IDocumentNodeItem) deserializer.deserializeToNodeItem(modelStream, documentUri);
+  public IDocumentNodeItem loadAsNodeItem(Format format, InputStream is, URI documentUri)
+      throws IOException {
+    try (ModelDetector.Result modelMatch = detectModel(is, format)) {
+
+      IDeserializer<?> deserializer = getDeserializer(
+          modelMatch.getBoundClass(),
+          format,
+          getConfiguration());
+      try (InputStream modelStream = modelMatch.getDataStream()) {
+        return (IDocumentNodeItem) deserializer.deserializeToNodeItem(modelStream, documentUri);
+      }
     }
   }
 
   @NonNull
-  private <CLASS> IDeserializer<CLASS> getDeserializer(
+  private <CLASS extends IBoundObject> IDeserializer<CLASS> getDeserializer(
       @NonNull Class<CLASS> clazz,
       @NonNull Format format,
       @NonNull IConfiguration<DeserializationFeature<?>> config) {
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/Format.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/Format.java
index 566f5a3eb..9a2f06fca 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/Format.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/Format.java
@@ -26,9 +26,13 @@
 
 package gov.nist.secauto.metaschema.databind.io;
 
+import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -41,20 +45,22 @@ public enum Format {
   /**
    * The <a href="https://www.w3.org/XML/">Extensible Markup Language</a> format.
    */
-  XML(".xml"),
+  XML(".xml", Set.of()),
   /**
    * The <a href="https://www.json.org/">JavaScript Object Notation</a> format.
    */
-  JSON(".json"),
+  JSON(".json", Set.of()),
   /**
    * The <a href="https://yaml.org/">YAML Ain't Markup Language</a> format.
    */
-  YAML(".yml");
+  YAML(".yaml", Set.of(".yml"));
 
   private static final List<String> NAMES;
 
   @NonNull
   private final String defaultExtension;
+  @NonNull
+  private final Set<String> recognizedExtensions;
 
   static {
     NAMES = Arrays.stream(values())
@@ -72,8 +78,24 @@ public static List<String> names() {
     return NAMES;
   }
 
-  Format(@NonNull String defaultExtension) {
+  Format(@NonNull String defaultExtension, Set<String> otherExtensions) {
     this.defaultExtension = defaultExtension;
+
+    Set<String> recognizedExtensions = new HashSet<>();
+    recognizedExtensions.add(defaultExtension);
+    recognizedExtensions.addAll(otherExtensions);
+
+    this.recognizedExtensions = CollectionUtil.unmodifiableSet(recognizedExtensions);
+  }
+
+  /**
+   * Get the default extension to use for the format.
+   *
+   * @return the default extension
+   */
+  @NonNull
+  public Set<String> getRecognizedExtensions() {
+    return recognizedExtensions;
   }
 
   /**
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IBoundLoader.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IBoundLoader.java
index e2ad09467..c74afdce2 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IBoundLoader.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IBoundLoader.java
@@ -30,15 +30,20 @@
 import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
 import gov.nist.secauto.metaschema.core.metapath.IDocumentLoader;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.DefaultBindingContext;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 
+import org.eclipse.jdt.annotation.Owning;
+import org.xml.sax.InputSource;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.Writer;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -77,7 +82,7 @@ default IBoundLoader disableFeature(DeserializationFeature<?> feature) {
    *           if an error occurred while reading the resource
    */
   @NonNull
-  default FormatDetector.Result detectFormat(@NonNull File file) throws IOException {
+  default Format detectFormat(@NonNull File file) throws IOException {
     return detectFormat(ObjectUtils.notNull(file.toPath()));
   }
 
@@ -91,7 +96,7 @@ default FormatDetector.Result detectFormat(@NonNull File file) throws IOExceptio
    *           if an error occurred while reading the resource
    */
   @NonNull
-  default FormatDetector.Result detectFormat(@NonNull Path path) throws IOException {
+  default Format detectFormat(@NonNull Path path) throws IOException {
     return detectFormat(ObjectUtils.notNull(path.toUri()));
   }
 
@@ -105,7 +110,7 @@ default FormatDetector.Result detectFormat(@NonNull Path path) throws IOExceptio
    *           if an error occurred while reading the resource
    */
   @NonNull
-  default FormatDetector.Result detectFormat(@NonNull URL url) throws IOException {
+  default Format detectFormat(@NonNull URL url) throws IOException {
     try {
       return detectFormat(ObjectUtils.notNull(url.toURI()));
     } catch (URISyntaxException ex) {
@@ -123,7 +128,7 @@ default FormatDetector.Result detectFormat(@NonNull URL url) throws IOException
    *           if an error occurred while reading the resource
    */
   @NonNull
-  FormatDetector.Result detectFormat(@NonNull URI uri) throws IOException;
+  Format detectFormat(@NonNull URI uri) throws IOException;
 
   /**
    * Determine the format of the provided resource.
@@ -144,26 +149,28 @@ default FormatDetector.Result detectFormat(@NonNull URL url) throws IOException
   @NonNull
   FormatDetector.Result detectFormat(@NonNull InputStream is) throws IOException;
 
-  //
-  // /**
-  // * Determine the format of the provided resource.
-  // * <p>
-  // * This method will consume data from any {@link InputStream} provided by the
-  // * {@link InputSource}. If the caller of this method intends to read data from
-  // * the stream after determining the format, the caller should pass in a stream
-  // * that can be reset.
-  // * <p>
-  // * This method will not close any {@link InputStream} provided by the
-  // * {@link InputSource}, since it does not own the stream.
-  // *
-  // * @param source
-  // * information about how to access the resource
-  // * @return the format of the provided resource
-  // * @throws IOException
-  // * if an error occurred while reading the resource
-  // */
-  // @NonNull
-  // Format detectFormat(@NonNull InputSource source) throws IOException;
+  /**
+   * Determine the model of the provided resource.
+   * <p>
+   * This method will consume data from any {@link InputStream} provided by the
+   * {@link InputSource}. If the caller of this method intends to read data from
+   * the stream after determining the format, the caller should pass in a stream
+   * that can be reset.
+   * <p>
+   * This method will not close any {@link InputStream} provided by the
+   * {@link InputSource}, since it does not own the stream.
+   *
+   * @param is
+   *          an input stream for the resource
+   * @param format
+   *          the format of the provided resource
+   * @return the model of the provided resource
+   * @throws IOException
+   *           if an error occurred while reading the resource
+   */
+  @NonNull
+  @Owning
+  ModelDetector.Result detectModel(@NonNull InputStream is, @NonNull Format format) throws IOException;
 
   /**
    * Load data from the provided resource into a bound object.
@@ -180,7 +187,7 @@ default FormatDetector.Result detectFormat(@NonNull URL url) throws IOException
    * @see #detectFormat(File)
    */
   @NonNull
-  default <CLASS> CLASS load(@NonNull File file) throws IOException {
+  default <CLASS extends IBoundObject> CLASS load(@NonNull File file) throws IOException {
     return load(ObjectUtils.notNull(file.toPath()));
   }
 
@@ -199,7 +206,7 @@ default <CLASS> CLASS load(@NonNull File file) throws IOException {
    * @see #detectFormat(File)
    */
   @NonNull
-  default <CLASS> CLASS load(@NonNull Path path) throws IOException {
+  default <CLASS extends IBoundObject> CLASS load(@NonNull Path path) throws IOException {
     return load(ObjectUtils.notNull(path.toUri()));
   }
 
@@ -220,7 +227,7 @@ default <CLASS> CLASS load(@NonNull Path path) throws IOException {
    * @see #detectFormat(URL)
    */
   @NonNull
-  default <CLASS> CLASS load(@NonNull URL url) throws IOException, URISyntaxException {
+  default <CLASS extends IBoundObject> CLASS load(@NonNull URL url) throws IOException, URISyntaxException {
     return load(ObjectUtils.notNull(url.toURI()));
   }
 
@@ -240,7 +247,7 @@ default <CLASS> CLASS load(@NonNull URL url) throws IOException, URISyntaxExcept
    * @see #detectFormat(URL)
    */
   @NonNull
-  <CLASS> CLASS load(@NonNull URI uri) throws IOException;
+  <CLASS extends IBoundObject> CLASS load(@NonNull URI uri) throws IOException;
 
   /**
    * Load data from the provided resource into a bound object.
@@ -262,7 +269,7 @@ default <CLASS> CLASS load(@NonNull URL url) throws IOException, URISyntaxExcept
    * @see #detectFormat(InputStream)
    */
   @NonNull
-  <CLASS> CLASS load(@NonNull InputStream is, @NonNull URI documentUri) throws IOException;
+  <CLASS extends IBoundObject> CLASS load(@NonNull InputStream is, @NonNull URI documentUri) throws IOException;
 
   /**
    * Load data from the specified resource into a bound object with the type of
@@ -279,7 +286,7 @@ default <CLASS> CLASS load(@NonNull URL url) throws IOException, URISyntaxExcept
    *           if an error occurred while loading the data in the specified file
    */
   @NonNull
-  default <CLASS> CLASS load(
+  default <CLASS extends IBoundObject> CLASS load(
       @NonNull Class<CLASS> clazz,
       @NonNull File file) throws IOException {
     return load(clazz, ObjectUtils.notNull(file.toPath()));
@@ -300,7 +307,7 @@ default <CLASS> CLASS load(
    *           if an error occurred while loading the data in the specified file
    */
   @NonNull
-  default <CLASS> CLASS load(
+  default <CLASS extends IBoundObject> CLASS load(
       @NonNull Class<CLASS> clazz,
       @NonNull Path path) throws IOException {
     return load(clazz, ObjectUtils.notNull(path.toUri()));
@@ -323,7 +330,7 @@ default <CLASS> CLASS load(
    *           if the provided {@code url} is malformed
    */
   @NonNull
-  default <CLASS> CLASS load(
+  default <CLASS extends IBoundObject> CLASS load(
       @NonNull Class<CLASS> clazz,
       @NonNull URL url) throws IOException, URISyntaxException {
     return load(clazz, ObjectUtils.notNull(url.toURI()));
@@ -344,7 +351,7 @@ default <CLASS> CLASS load(
    *           if an error occurred while loading the data in the specified file
    */
   @NonNull
-  <CLASS> CLASS load(
+  <CLASS extends IBoundObject> CLASS load(
       @NonNull Class<CLASS> clazz,
       @NonNull URI uri) throws IOException;
 
@@ -375,8 +382,37 @@ <CLASS> CLASS load(
    *           resource
    */
   @NonNull
-  <CLASS> CLASS load(
+  <CLASS extends IBoundObject> CLASS load(
+      @NonNull Class<CLASS> clazz,
+      @NonNull InputStream is,
+      @NonNull URI documentUri) throws IOException;
+
+  /**
+   * Load data from the specified resource into a bound object with the type of
+   * the specified Java class.
+   * <p>
+   * This method will not close the provided {@link InputStream}, since it does
+   * not own the stream.
+   *
+   * @param <CLASS>
+   *          the Java type to load data into
+   * @param format
+   *          the format to parse
+   * @param clazz
+   *          the class for the java type
+   * @param is
+   *          the resource stream
+   * @param documentUri
+   *          the URI of the resource
+   * @return the loaded data
+   * @throws IOException
+   *           if an error occurred while loading the data from the specified
+   *           resource
+   */
+  @NonNull
+  <CLASS extends IBoundObject> CLASS load(
       @NonNull Class<CLASS> clazz,
+      @NonNull Format format,
       @NonNull InputStream is,
       @NonNull URI documentUri) throws IOException;
 
@@ -479,7 +515,7 @@ IDocumentNodeItem loadAsNodeItem(
    *           if an error occurred while loading the data from the specified
    *           resource or writing the converted data to the specified destination
    */
-  default <CLASS> void convert(
+  default <CLASS extends IBoundObject> void convert(
       @NonNull Path source,
       @NonNull Path destination,
       @NonNull Format toFormat,
@@ -513,7 +549,7 @@ default <CLASS> void convert(
    *           if an error occurred while loading the data from the specified
    *           resource or writing the converted data to the specified destination
    */
-  default <CLASS> void convert(
+  default <CLASS extends IBoundObject> void convert(
       @NonNull Path source,
       @NonNull OutputStream os,
       @NonNull Format toFormat,
@@ -523,4 +559,106 @@ default <CLASS> void convert(
     ISerializer<CLASS> serializer = getBindingContext().newSerializer(toFormat, rootClass);
     serializer.serialize(object, os);
   }
+
+  /**
+   * Auto convert the provided {@code source} to the provided {@code toFormat}.
+   * Write the converted content to the provided {@code destination}.
+   * <p>
+   * The format of the source is expected to be auto detected using
+   * {@link #detectFormat(Path)}.
+   *
+   * @param <CLASS>
+   *          the Java type to load data into
+   * @param source
+   *          the resource to convert
+   * @param destination
+   *          the resource to write converted content to
+   * @param toFormat
+   *          the format to convert to
+   * @param rootClass
+   *          the class for the Java type to load data into
+   * @throws FileNotFoundException
+   *           the the provided source file was not found
+   * @throws IOException
+   *           if an error occurred while loading the data from the specified
+   *           resource or writing the converted data to the specified destination
+   */
+  default <CLASS extends IBoundObject> void convert(
+      @NonNull URI source,
+      @NonNull Path destination,
+      @NonNull Format toFormat,
+      @NonNull Class<CLASS> rootClass) throws FileNotFoundException, IOException {
+    CLASS object = load(rootClass, source);
+
+    ISerializer<CLASS> serializer = getBindingContext().newSerializer(toFormat, rootClass);
+    serializer.serialize(object, destination);
+  }
+
+  /**
+   * Auto convert the provided {@code source} to the provided {@code toFormat}.
+   * Write the converted content to the provided {@code destination}.
+   * <p>
+   * The format of the source is expected to be auto detected using
+   * {@link #detectFormat(Path)}.
+   *
+   * @param <CLASS>
+   *          the Java type to load data into
+   * @param source
+   *          the resource to convert
+   * @param os
+   *          the output stream to write converted content to
+   * @param toFormat
+   *          the format to convert to
+   * @param rootClass
+   *          the class for the Java type to load data into
+   * @throws FileNotFoundException
+   *           the the provided source file was not found
+   * @throws IOException
+   *           if an error occurred while loading the data from the specified
+   *           resource or writing the converted data to the specified destination
+   */
+  default <CLASS extends IBoundObject> void convert(
+      @NonNull URI source,
+      @NonNull OutputStream os,
+      @NonNull Format toFormat,
+      @NonNull Class<CLASS> rootClass) throws FileNotFoundException, IOException {
+    CLASS object = load(rootClass, source);
+
+    ISerializer<CLASS> serializer = getBindingContext().newSerializer(toFormat, rootClass);
+    serializer.serialize(object, os);
+  }
+
+  /**
+   * Auto convert the provided {@code source} to the provided {@code toFormat}.
+   * Write the converted content to the provided {@code destination}.
+   * <p>
+   * The format of the source is expected to be auto detected using
+   * {@link #detectFormat(Path)}.
+   *
+   * @param <CLASS>
+   *          the Java type to load data into
+   * @param source
+   *          the resource to convert
+   * @param writer
+   *          the writer to write converted content to
+   * @param toFormat
+   *          the format to convert to
+   * @param rootClass
+   *          the class for the Java type to load data into
+   * @throws FileNotFoundException
+   *           the the provided source file was not found
+   * @throws IOException
+   *           if an error occurred while loading the data from the specified
+   *           resource or writing the converted data to the specified destination
+   */
+  default <CLASS extends IBoundObject> void convert(
+      @NonNull URI source,
+      @NonNull Writer writer,
+      @NonNull Format toFormat,
+      @NonNull Class<CLASS> rootClass) throws FileNotFoundException, IOException {
+    CLASS object = load(rootClass, source);
+
+    ISerializer<CLASS> serializer = getBindingContext().newSerializer(toFormat, rootClass);
+    serializer.serialize(object, writer);
+  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IDeserializer.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IDeserializer.java
index 00c949ad9..d1e814f44 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IDeserializer.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IDeserializer.java
@@ -29,6 +29,7 @@
 import gov.nist.secauto.metaschema.core.configuration.IConfiguration;
 import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraintValidationHandler;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
@@ -53,7 +54,7 @@
  * @param <CLASS>
  *          the Java type into which data can be read
  */
-public interface IDeserializer<CLASS> extends IMutableConfiguration<DeserializationFeature<?>> {
+public interface IDeserializer<CLASS extends IBoundObject> extends IMutableConfiguration<DeserializationFeature<?>> {
 
   @Override
   IDeserializer<CLASS> enableFeature(DeserializationFeature<?> feature);
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IParsingContext.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IParsingContext.java
index 4db25187e..4916b2a37 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IParsingContext.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IParsingContext.java
@@ -1,55 +1,55 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.io;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-/**
- * Provides objects used for parsing data associated with a specific format.
- *
- * @param <READER>
- *          the format specific data reader
- * @param <PROBLEM_HANDLER>
- *          the format specific problem handler
- */
-public interface IParsingContext<READER, PROBLEM_HANDLER extends IProblemHandler> {
-  /**
-   * The parser used for reading data associated with the supported format.
-   *
-   * @return the parser
-   */
-  @NonNull
-  READER getReader();
-
-  /**
-   * A handler that provides callbacks used to resolve parsing issues.
-   *
-   * @return the configured handler
-   */
-  @NonNull
-  PROBLEM_HANDLER getProblemHandler();
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.io;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * Provides objects used for parsing data associated with a specific format.
+ *
+ * @param <READER>
+ *          the format specific data reader
+ * @param <PROBLEM_HANDLER>
+ *          the format specific problem handler
+ */
+public interface IParsingContext<READER, PROBLEM_HANDLER extends IProblemHandler> {
+  /**
+   * The parser used for reading data associated with the supported format.
+   *
+   * @return the parser
+   */
+  @NonNull
+  READER getReader();
+
+  /**
+   * A handler that provides callbacks used to resolve parsing issues.
+   *
+   * @return the configured handler
+   */
+  @NonNull
+  PROBLEM_HANDLER getProblemHandler();
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IProblemHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IProblemHandler.java
index 2d030b65b..91da912c7 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IProblemHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IProblemHandler.java
@@ -26,7 +26,8 @@
 
 package gov.nist.secauto.metaschema.databind.io;
 
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundProperty;
 
 import java.io.IOException;
@@ -53,8 +54,8 @@ public interface IProblemHandler {
    *           if an error occurred while handling the missing instances
    */
   void handleMissingInstances(
-      @NonNull IBoundDefinitionModel parentDefinition,
-      @NonNull Object targetObject,
-      @NonNull Collection<? extends IBoundProperty> unhandledInstances)
+      @NonNull IBoundDefinitionModelComplex parentDefinition,
+      @NonNull IBoundObject targetObject,
+      @NonNull Collection<? extends IBoundProperty<?>> unhandledInstances)
       throws IOException;
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ISerializer.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ISerializer.java
index 2ca7f0e98..1a868eef3 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ISerializer.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ISerializer.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.configuration.IConfiguration;
 import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.io.File;
@@ -50,7 +51,7 @@
  * @param <CLASS>
  *          the Java type from which data can be written
  */
-public interface ISerializer<CLASS> extends IMutableConfiguration<SerializationFeature<?>> {
+public interface ISerializer<CLASS extends IBoundObject> extends IMutableConfiguration<SerializationFeature<?>> {
 
   @Override
   ISerializer<CLASS> enableFeature(SerializationFeature<?> feature);
@@ -77,7 +78,7 @@ public interface ISerializer<CLASS> extends IMutableConfiguration<SerializationF
    * @throws IOException
    *           if an error occurred while writing data to the stream
    */
-  default void serialize(@NonNull CLASS data, @NonNull OutputStream os) throws IOException {
+  default void serialize(@NonNull IBoundObject data, @NonNull OutputStream os) throws IOException {
     OutputStreamWriter writer = new OutputStreamWriter(os, StandardCharsets.UTF_8);
     serialize(data, writer);
     writer.flush();
@@ -96,7 +97,7 @@ default void serialize(@NonNull CLASS data, @NonNull OutputStream os) throws IOE
    *           if an error occurred while writing data to the file indicated by
    *           the {@code path} parameter
    */
-  default void serialize(@NonNull CLASS data, @NonNull Path path, OpenOption... openOptions) throws IOException {
+  default void serialize(@NonNull IBoundObject data, @NonNull Path path, OpenOption... openOptions) throws IOException {
     try (Writer writer = Files.newBufferedWriter(path, StandardCharsets.UTF_8, openOptions)) {
       assert writer != null;
       serialize(data, writer);
@@ -113,7 +114,7 @@ default void serialize(@NonNull CLASS data, @NonNull Path path, OpenOption... op
    * @throws IOException
    *           if an error occurred while writing data to the stream
    */
-  default void serialize(@NonNull CLASS data, @NonNull File file) throws IOException {
+  default void serialize(@NonNull IBoundObject data, @NonNull File file) throws IOException {
     serialize(data, ObjectUtils.notNull(file.toPath()), StandardOpenOption.CREATE, StandardOpenOption.WRITE,
         StandardOpenOption.TRUNCATE_EXISTING);
   }
@@ -128,5 +129,5 @@ default void serialize(@NonNull CLASS data, @NonNull File file) throws IOExcepti
    * @throws IOException
    *           if an error occurred while writing data to the stream
    */
-  void serialize(@NonNull CLASS data, @NonNull Writer writer) throws IOException;
+  void serialize(@NonNull IBoundObject data, @NonNull Writer writer) throws IOException;
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IWritingContext.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IWritingContext.java
index 4e8ed94a8..9e6c7e304 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IWritingContext.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/IWritingContext.java
@@ -26,6 +26,8 @@
 
 package gov.nist.secauto.metaschema.databind.io;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
 import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler;
 
 import java.io.IOException;
@@ -41,10 +43,25 @@ public interface IWritingContext<WRITER> {
   @NonNull
   WRITER getWriter();
 
+  /**
+   * Write the data described by the provided {@code targetObject} as an XML
+   * element.
+   *
+   * @param definition
+   *          the bound Module definition describing the data to write
+   * @param targetObject
+   *          the Java object data to write
+   * @throws IOException
+   *           if an error occurred while writing
+   */
+  void write(
+      @NonNull IBoundDefinitionModelComplex definition,
+      @NonNull IBoundObject targetObject) throws IOException;
+
   @FunctionalInterface
   interface ObjectWriter<T extends IFeatureComplexItemValueHandler> {
 
-    void accept(@NonNull Object parentItem, @NonNull T handler) throws IOException;
+    void accept(@NonNull IBoundObject parentItem, @NonNull T handler) throws IOException;
 
     /**
      * Perform a series of property write operations, starting first with this
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ModelDetector.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ModelDetector.java
index 647228e8f..aae4733ea 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ModelDetector.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/ModelDetector.java
@@ -34,6 +34,7 @@
 
 import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration;
 import gov.nist.secauto.metaschema.core.configuration.IConfiguration;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.util.JsonUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
@@ -42,8 +43,11 @@
 
 import org.codehaus.stax2.XMLEventReader2;
 import org.codehaus.stax2.XMLInputFactory2;
+import org.eclipse.jdt.annotation.NotOwning;
+import org.eclipse.jdt.annotation.Owning;
 
 import java.io.ByteArrayInputStream;
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -121,23 +125,30 @@ private IConfiguration<DeserializationFeature<?>> getConfiguration() {
    *           if an error occurred while reading the resource
    */
   @NonNull
-  public Result detect(@NonNull InputStream inputStream, @NonNull Format format)
+  @Owning
+  public Result detect(@NonNull @NotOwning InputStream inputStream, @NonNull Format format)
       throws IOException {
     byte[] buf = ObjectUtils.notNull(inputStream.readNBytes(getLookaheadLimit()));
 
-    Class<?> clazz;
+    Class<? extends IBoundObject> clazz;
     try (InputStream bis = new ByteArrayInputStream(buf)) {
+      assert bis != null;
       switch (format) {
       case JSON:
-        clazz = detectModelJsonClass(ObjectUtils.notNull(
-            JsonFactoryFactory.instance().createParser(bis)));
+        try (JsonParser parser = JsonFactoryFactory.instance().createParser(bis)) {
+          assert parser != null;
+          clazz = detectModelJsonClass(parser);
+        }
         break;
       case YAML:
         YAMLFactory factory = YamlFactoryFactory.newParserFactoryInstance(getConfiguration());
-        clazz = detectModelJsonClass(ObjectUtils.notNull(factory.createParser(bis)));
+        try (JsonParser parser = factory.createParser(bis)) {
+          assert parser != null;
+          clazz = detectModelJsonClass(parser);
+        }
         break;
       case XML:
-        clazz = detectModelXmlClass(ObjectUtils.notNull(bis));
+        clazz = detectModelXmlClass(bis);
         break;
       default:
         throw new UnsupportedOperationException(
@@ -154,7 +165,7 @@ public Result detect(@NonNull InputStream inputStream, @NonNull Format format)
   }
 
   @NonNull
-  private Class<?> detectModelXmlClass(@NonNull InputStream is) throws IOException {
+  private Class<? extends IBoundObject> detectModelXmlClass(@NonNull InputStream is) throws IOException {
     QName startElementQName;
     try {
       XMLInputFactory2 xmlInputFactory = (XMLInputFactory2) XMLInputFactory.newInstance();
@@ -178,7 +189,7 @@ private Class<?> detectModelXmlClass(@NonNull InputStream is) throws IOException
       throw new IOException(ex);
     }
 
-    Class<?> clazz = getBindingContext().getBoundClassForRootXmlQName(startElementQName);
+    Class<? extends IBoundObject> clazz = getBindingContext().getBoundClassForRootXmlQName(startElementQName);
     if (clazz == null) {
       throw new IOException("Unrecognized element name: " + startElementQName.toString());
     }
@@ -186,32 +197,31 @@ private Class<?> detectModelXmlClass(@NonNull InputStream is) throws IOException
   }
 
   @Nullable
-  private Class<?> detectModelJsonClass(@NonNull JsonParser parser) throws IOException {
-    Class<?> retval = null;
+  private Class<? extends IBoundObject> detectModelJsonClass(@NonNull JsonParser parser) throws IOException {
+    Class<? extends IBoundObject> retval = null;
     JsonUtil.advanceAndAssert(parser, JsonToken.START_OBJECT);
     outer: while (JsonToken.FIELD_NAME.equals(parser.nextToken())) {
       String name = ObjectUtils.notNull(parser.getCurrentName());
-      if ("$schema".equals(name)) {
-        // do nothing
-        parser.nextToken();
-        // JsonUtil.skipNextValue(parser);
-      } else {
+      if (!"$schema".equals(name)) {
         IBindingContext bindingContext = getBindingContext();
         retval = bindingContext.getBoundClassForRootJsonName(name);
         break outer;
       }
+      // do nothing
+      parser.nextToken();
+      // JsonUtil.skipNextValue(parser);
     }
     return retval;
   }
 
-  public static final class Result {
+  public static final class Result implements Closeable {
     @NonNull
-    private final Class<?> boundClass;
-    @NonNull
-    private final InputStream dataStream;
+    private final Class<? extends IBoundObject> boundClass;
+    @Owning
+    private InputStream dataStream;
 
     private Result(
-        @NonNull Class<?> clazz,
+        @NonNull Class<? extends IBoundObject> clazz,
         @NonNull InputStream is,
         @NonNull byte[] buf) {
       this.boundClass = clazz;
@@ -224,7 +234,7 @@ private Result(
      * @return the Java class
      */
     @NonNull
-    public Class<?> getBoundClass() {
+    public Class<? extends IBoundObject> getBoundClass() {
       return boundClass;
     }
 
@@ -235,8 +245,15 @@ public Class<?> getBoundClass() {
      * @return the stream
      */
     @NonNull
+    @Owning
     public InputStream getDataStream() {
-      return dataStream;
+      return ObjectUtils.requireNonNull(dataStream, "data stream already closed");
+    }
+
+    @Override
+    public void close() throws IOException {
+      this.dataStream.close();
+      this.dataStream = null;
     }
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonDeserializer.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonDeserializer.java
index 1077ad2d4..bfe011308 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonDeserializer.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonDeserializer.java
@@ -32,6 +32,7 @@
 import gov.nist.secauto.metaschema.core.configuration.IConfiguration;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.AbstractDeserializer;
 import gov.nist.secauto.metaschema.databind.io.DeserializationFeature;
@@ -43,7 +44,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public class DefaultJsonDeserializer<CLASS>
+public class DefaultJsonDeserializer<CLASS extends IBoundObject>
     extends AbstractDeserializer<CLASS> {
   private JsonFactory jsonFactory;
 
@@ -116,7 +117,7 @@ protected INodeItem deserializeToNodeItemInternal(@NonNull Reader reader, @NonNu
       if (definition.isRoot()
           && configuration.isFeatureEnabled(DeserializationFeature.DESERIALIZE_JSON_ROOT_PROPERTY)) {
         // now parse the root property
-        CLASS value = ObjectUtils.requireNonNull(parser.readProperty(definition, definition.getRootJsonName()));
+        CLASS value = ObjectUtils.requireNonNull(parser.readObjectRoot(definition, definition.getRootJsonName()));
 
         retval = INodeItemFactory.instance().newDocumentNodeItem(definition, documentUri, value);
       } else {
@@ -141,7 +142,7 @@ public CLASS deserializeToValue(@NonNull Reader reader, @NonNull URI documentUri
           && configuration.isFeatureEnabled(DeserializationFeature.DESERIALIZE_JSON_ROOT_PROPERTY)) {
 
         // now parse the root property
-        retval = ObjectUtils.requireNonNull(parser.readProperty(definition, definition.getRootJsonName()));
+        retval = ObjectUtils.requireNonNull(parser.readObjectRoot(definition, definition.getRootJsonName()));
       } else {
         // read the top-level definition
         retval = ObjectUtils.asType(ObjectUtils.requireNonNull(
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonProblemHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonProblemHandler.java
index 601f6bff2..0aae1feff 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonProblemHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonProblemHandler.java
@@ -26,6 +26,9 @@
 
 package gov.nist.secauto.metaschema.databind.io.json;
 
+import com.fasterxml.jackson.core.JsonParser;
+
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.util.JsonUtil;
 import gov.nist.secauto.metaschema.databind.io.AbstractProblemHandler;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
@@ -45,16 +48,15 @@ public class DefaultJsonProblemHandler
     IGNORED_FIELD_NAMES.add(JSON_SCHEMA_FIELD_NAME);
   }
 
-  @SuppressWarnings("resource")
   @Override
   public boolean handleUnknownProperty(
       IBoundDefinitionModelComplex classBinding,
-      Object targetObject,
+      IBoundObject targetObject,
       String fieldName,
-      IJsonParsingContext.IInstanceReader reader) throws IOException {
+      JsonParser parser) throws IOException {
     boolean retval = false;
     if (IGNORED_FIELD_NAMES.contains(fieldName)) {
-      JsonUtil.skipNextValue(reader.getJsonParser());
+      JsonUtil.skipNextValue(parser);
       retval = true;
     }
     return retval;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonSerializer.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonSerializer.java
index 98cf637a8..ecc7a3f3f 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonSerializer.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/DefaultJsonSerializer.java
@@ -31,6 +31,7 @@
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 
 import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.AbstractSerializer;
 import gov.nist.secauto.metaschema.databind.io.SerializationFeature;
@@ -41,7 +42,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public class DefaultJsonSerializer<CLASS>
+public class DefaultJsonSerializer<CLASS extends IBoundObject>
     extends AbstractSerializer<CLASS> {
   private JsonFactory jsonFactory;
 
@@ -98,7 +99,7 @@ private JsonGenerator newJsonGenerator(@NonNull Writer writer) throws IOExceptio
   }
 
   @Override
-  public void serialize(CLASS data, Writer writer) throws IOException {
+  public void serialize(IBoundObject data, Writer writer) throws IOException {
     try (JsonGenerator generator = newJsonGenerator(writer)) {
       IBoundDefinitionModelAssembly definition = getDefinition();
 
@@ -111,7 +112,7 @@ public void serialize(CLASS data, Writer writer) throws IOException {
       }
 
       MetaschemaJsonWriter jsonWriter = new MetaschemaJsonWriter(generator);
-      definition.writeItem(data, jsonWriter);
+      jsonWriter.write(definition, data);
 
       if (serializeRoot) {
         generator.writeEndObject();
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonParsingContext.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonParsingContext.java
index 6b17fd622..e05e8a3ea 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonParsingContext.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonParsingContext.java
@@ -31,18 +31,10 @@
 import gov.nist.secauto.metaschema.databind.io.IParsingContext;
 import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 public interface IJsonParsingContext extends IParsingContext<JsonParser, IJsonProblemHandler> {
   // no additional methods
 
   interface IInstanceReader extends IItemReadHandler {
-    @NonNull
-    JsonParser getJsonParser();
-  }
-
-  interface ItemReader extends IItemReadHandler {
     // no additional methods
   }
-
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonProblemHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonProblemHandler.java
index bb4a47e2c..2f163fc7b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonProblemHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonProblemHandler.java
@@ -26,6 +26,9 @@
 
 package gov.nist.secauto.metaschema.databind.io.json;
 
+import com.fasterxml.jackson.core.JsonParser;
+
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.databind.io.IProblemHandler;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
 
@@ -46,7 +49,7 @@ public interface IJsonProblemHandler extends IProblemHandler {
    *          the Java object for the {@code parentDefinition}
    * @param fieldName
    *          the unknown JSON field name
-   * @param reader
+   * @param parser
    *          the JSON reader context used for parsing
    * @return {@code true} if the attribute was handled by this method, or
    *         {@code false} otherwise
@@ -55,7 +58,7 @@ public interface IJsonProblemHandler extends IProblemHandler {
    */
   boolean handleUnknownProperty(
       @NonNull IBoundDefinitionModelComplex definition,
-      @Nullable Object parentItem,
+      @Nullable IBoundObject parentItem,
       @NonNull String fieldName,
-      @NonNull IJsonParsingContext.IInstanceReader reader) throws IOException;
+      @NonNull JsonParser parser) throws IOException;
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonWritingContext.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonWritingContext.java
index aa47e6be9..21738973e 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonWritingContext.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/IJsonWritingContext.java
@@ -29,8 +29,7 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 
 import gov.nist.secauto.metaschema.databind.io.IWritingContext;
-import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler;
 
-public interface IJsonWritingContext extends IWritingContext<JsonGenerator>, IItemWriteHandler {
+public interface IJsonWritingContext extends IWritingContext<JsonGenerator> {
   // no additional methods
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonReader.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonReader.java
index 9b850156b..24fd2abdd 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonReader.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonReader.java
@@ -26,20 +26,23 @@
 
 package gov.nist.secauto.metaschema.databind.io.json;
 
+import com.fasterxml.jackson.core.JsonLocation;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.util.JsonUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue;
+import gov.nist.secauto.metaschema.databind.model.IBoundInstance;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly;
@@ -52,6 +55,7 @@
 import gov.nist.secauto.metaschema.databind.model.IBoundProperty;
 import gov.nist.secauto.metaschema.databind.model.info.AbstractModelInstanceReadHandler;
 import gov.nist.secauto.metaschema.databind.model.info.IFeatureScalarItemValueHandler;
+import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler;
 import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo;
 
 import org.apache.logging.log4j.LogManager;
@@ -68,18 +72,17 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class MetaschemaJsonReader
-    implements IJsonParsingContext {
+    implements IJsonParsingContext, IItemReadHandler {
   private static final Logger LOGGER = LogManager.getLogger(MetaschemaJsonReader.class);
 
   @NonNull
   private final Deque<JsonParser> parserStack = new LinkedList<>();
-  @NonNull
-  private final InstanceReader instanceReader = new InstanceReader();
-  @NonNull
-  private final ItemReader itemReader = new ItemReader();
+  // @NonNull
+  // private final InstanceReader instanceReader = new InstanceReader();
 
   @NonNull
   private final IJsonProblemHandler problemHandler;
@@ -95,6 +98,7 @@ public class MetaschemaJsonReader
    *           if an error occurred while reading the JSON
    * @see DefaultJsonProblemHandler
    */
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public MetaschemaJsonReader(
       @NonNull JsonParser parser) throws IOException {
     this(parser, new DefaultJsonProblemHandler());
@@ -110,11 +114,12 @@ public MetaschemaJsonReader(
    * @throws IOException
    *           if an error occurred while reading the JSON
    */
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public MetaschemaJsonReader(
       @NonNull JsonParser parser,
       @NonNull IJsonProblemHandler problemHandler) throws IOException {
     this.problemHandler = problemHandler;
-    this.objectMapper = ObjectUtils.notNull(Lazy.lazy(() -> new ObjectMapper()));
+    this.objectMapper = ObjectUtils.notNull(Lazy.lazy(ObjectMapper::new));
     push(parser);
   }
 
@@ -124,16 +129,6 @@ public JsonParser getReader() {
     return ObjectUtils.notNull(parserStack.peek());
   }
 
-  @NonNull
-  protected InstanceReader getInstanceReader() {
-    return instanceReader;
-  }
-
-  @NonNull
-  protected ItemReader getItemReader() {
-    return itemReader;
-  }
-
   // protected void analyzeParserStack(@NonNull String action) throws IOException
   // {
   // StringBuilder builder = new StringBuilder()
@@ -184,494 +179,535 @@ protected ObjectMapper getObjectMapper() {
     return ObjectUtils.notNull(objectMapper.get());
   }
 
-  public class InstanceReader implements IJsonParsingContext.IInstanceReader {
+  @SuppressWarnings("unchecked")
+  @NonNull
+  public <T> T readObject(@NonNull IBoundDefinitionModelComplex definition) throws IOException {
+    return (T) definition.readItem(null, this);
+  }
 
-    @Override
-    public JsonParser getJsonParser() {
-      return getReader();
-    }
+  @SuppressWarnings({ "unchecked", "resource" })
+  @NonNull
+  public <T> T readObjectRoot(
+      @NonNull IBoundDefinitionModelComplex definition,
+      @NonNull String expectedFieldName) throws IOException {
+    JsonParser parser = getReader();
 
-    @Override
-    public Object readItemFlag(Object parentItem, IBoundInstanceFlag instance) throws IOException {
-      return readInstance(instance, parentItem);
+    boolean hasStartObject = JsonToken.START_OBJECT.equals(parser.currentToken());
+    if (hasStartObject) {
+      // advance past the start object
+      JsonUtil.assertAndAdvance(parser, JsonToken.START_OBJECT);
     }
 
-    @Override
-    public Object readItemField(Object parentItem, IBoundInstanceModelFieldScalar instance) throws IOException {
-      return readModelInstance(instance, parentItem);
-    }
+    T retval = null;
+    JsonToken token;
+    while (!JsonToken.END_OBJECT.equals(token = parser.currentToken()) && token != null) {
+      if (!JsonToken.FIELD_NAME.equals(token)) {
+        throw new IOException(String.format("Expected FIELD_NAME token, found '%s'", token.toString()));
+      }
 
-    @Override
-    public Object readItemField(Object parentItem, IBoundInstanceModelFieldComplex instance) throws IOException {
-      return readModelInstance(instance, parentItem);
-    }
+      String propertyName = ObjectUtils.notNull(parser.currentName());
+      if (expectedFieldName.equals(propertyName)) {
+        // process the object value, bound to the requested class
+        JsonUtil.assertAndAdvance(parser, JsonToken.FIELD_NAME);
 
-    @Override
-    public Object readItemField(Object parentItem, IBoundInstanceModelGroupedField instance) throws IOException {
-      throw new UnsupportedOperationException("not needed");
-    }
+        // stop now, since we found the field
+        retval = (T) definition.readItem(null, this);
+        break;
+      }
 
-    @Override
-    public Object readItemField(Object item, IBoundDefinitionModelFieldComplex definition) throws IOException {
-      return definition.readItem(item, getItemReader());
+      if (!getProblemHandler().handleUnknownProperty(
+          definition,
+          null,
+          propertyName,
+          getReader())) {
+        if (LOGGER.isWarnEnabled()) {
+          LOGGER.warn("Skipping unhandled JSON field '{}'{}.", propertyName, JsonUtil.toString(parser));
+        }
+        JsonUtil.skipNextValue(parser);
+      }
     }
 
-    @Override
-    public Object readItemFieldValue(Object parentItem, IBoundFieldValue fieldValue) throws IOException {
-      return readInstance(fieldValue, parentItem);
+    if (hasStartObject) {
+      // advance past the end object
+      JsonUtil.assertAndAdvance(parser, JsonToken.END_OBJECT);
     }
 
-    @Override
-    public Object readItemAssembly(Object parentItem, IBoundInstanceModelAssembly instance) throws IOException {
-      return readModelInstance(instance, parentItem);
+    if (retval == null) {
+      throw new IOException(String.format("Failed to find property with name '%s'%s.",
+          expectedFieldName,
+          JsonUtil.generateLocationMessage(parser)));
     }
+    return retval;
+  }
 
-    @Override
-    public Object readItemAssembly(Object parentItem, IBoundInstanceModelGroupedAssembly instance) throws IOException {
-      throw new UnsupportedOperationException("not needed");
-    }
+  // ================
+  // Instance readers
+  // ================
 
-    @Override
-    public Object readItemAssembly(Object item, IBoundDefinitionModelAssembly definition) throws IOException {
-      return getItemReader().readItemAssembly(item, definition);
-    }
+  @NonNull
+  private Object readInstance(
+      @NonNull IBoundProperty<?> instance,
+      @NonNull IBoundObject parent) throws IOException {
+    return instance.readItem(parent, this);
+  }
 
-    @Override
-    public Object readChoiceGroupItem(Object parentItem, IBoundInstanceModelChoiceGroup instance) throws IOException {
-      return readModelInstance(instance, parentItem);
-    }
+  @NonNull
+  private <T> Object readModelInstance(
+      @NonNull IBoundInstanceModel<T> instance,
+      @NonNull IBoundObject parent) throws IOException {
+    IModelInstanceCollectionInfo<T> collectionInfo = instance.getCollectionInfo();
+    return collectionInfo.readItems(new ModelInstanceReadHandler<>(instance, parent));
+  }
 
-    @NonNull
-    private Object readInstance(
-        @NonNull IBoundProperty instance,
-        @NonNull Object parentItem) throws IOException {
-      return instance.readItem(parentItem, getItemReader());
-    }
+  private Object readFieldValue(
+      @NonNull IBoundFieldValue instance,
+      @NonNull IBoundObject parent) throws IOException {
+    // handle the value key name case
+    return instance.readItem(parent, this);
+  }
 
-    @NonNull
-    private Object readModelInstance(
-        @NonNull IBoundInstanceModel instance,
-        @NonNull Object parentItem) throws IOException {
-      IModelInstanceCollectionInfo collectionInfo = instance.getCollectionInfo();
-      return collectionInfo.readItems(new ModelInstanceReadHandler(instance, parentItem, getItemReader()));
+  private Object readObjectProperty(
+      @NonNull IBoundObject parent,
+      @NonNull IBoundProperty<?> property) throws IOException {
+    Object retval;
+    if (property instanceof IBoundInstanceModel) {
+      retval = readModelInstance((IBoundInstanceModel<?>) property, parent);
+    } else if (property instanceof IBoundInstance) {
+      retval = readInstance(property, parent);
+    } else { // IBoundFieldValue
+      retval = readFieldValue((IBoundFieldValue) property, parent);
     }
+    return retval;
   }
 
-  private final class ItemReader implements IJsonParsingContext.ItemReader {
+  @Override
+  public Object readItemFlag(IBoundObject parentItem, IBoundInstanceFlag instance) throws IOException {
+    return readScalarItem(instance);
+  }
 
-    @Override
-    public Object readItemFlag(Object parentItem, IBoundInstanceFlag instance) throws IOException {
-      return readScalarItem(instance);
-    }
+  @Override
+  public Object readItemField(IBoundObject parentItem, IBoundInstanceModelFieldScalar instance) throws IOException {
+    return readScalarItem(instance);
+  }
 
-    @Override
-    public Object readItemField(Object parentItem, IBoundInstanceModelFieldScalar instance) throws IOException {
-      return readScalarItem(instance);
-    }
+  @Override
+  public IBoundObject readItemField(IBoundObject parentItem, IBoundInstanceModelFieldComplex instance)
+      throws IOException {
+    return readFieldObject(
+        parentItem,
+        instance.getDefinition(),
+        instance.getJsonProperties(),
+        instance.getEffectiveJsonKey(),
+        getProblemHandler());
+  }
 
-    @Override
-    public Object readItemField(Object parentItem, IBoundInstanceModelFieldComplex instance) throws IOException {
-      return readFieldObject(
-          parentItem,
-          instance.getDefinition(),
-          instance.getJsonProperties(),
-          instance.getJsonKey(),
-          getProblemHandler());
-    }
+  @Override
+  public IBoundObject readItemField(IBoundObject parentItem, IBoundInstanceModelGroupedField instance)
+      throws IOException {
+    IJsonProblemHandler problemHandler = new GroupedInstanceProblemHandler(instance, getProblemHandler());
+    IBoundDefinitionModelFieldComplex definition = instance.getDefinition();
+    IBoundInstanceFlag jsonValueKeyFlag = definition.getJsonValueKeyFlagInstance();
+
+    IJsonProblemHandler actualProblemHandler = jsonValueKeyFlag == null
+        ? problemHandler
+        : new JsomValueKeyProblemHandler(problemHandler, jsonValueKeyFlag);
+
+    return readComplexDefinitionObject(
+        parentItem,
+        definition,
+        instance.getEffectiveJsonKey(),
+        new PropertyBodyHandler(instance.getJsonProperties()),
+        actualProblemHandler);
+  }
 
-    @Override
-    public Object readItemField(Object parentItem, IBoundInstanceModelGroupedField instance) throws IOException {
-      IJsonProblemHandler problemHandler = new GroupedInstanceProblemHandler(instance, getProblemHandler());
-      IBoundDefinitionModelFieldComplex definition = instance.getDefinition();
-      IBoundInstanceFlag jsonValueKeyFlag = definition.getJsonValueKeyFlagInstance();
+  @Override
+  public IBoundObject readItemField(IBoundObject parentItem, IBoundDefinitionModelFieldComplex definition)
+      throws IOException {
+    return readFieldObject(
+        parentItem,
+        definition,
+        definition.getJsonProperties(),
+        null,
+        getProblemHandler());
+  }
 
-      IJsonProblemHandler actualProblemHandler = jsonValueKeyFlag == null
-          ? problemHandler
-          : new JsomValueKeyProblemHandler(problemHandler, jsonValueKeyFlag);
+  @Override
+  public Object readItemFieldValue(IBoundObject parentItem, IBoundFieldValue fieldValue) throws IOException {
+    // read the field value's value
+    return readScalarItem(fieldValue);
+  }
 
-      return readComplexDefinitionObject(
-          parentItem,
-          definition,
-          instance.getJsonKey(),
-          new PropertyBodyHandler(instance.getJsonProperties()),
-          actualProblemHandler);
-    }
+  @Override
+  public IBoundObject readItemAssembly(IBoundObject parentItem, IBoundInstanceModelAssembly instance)
+      throws IOException {
+    IBoundInstanceFlag jsonKey = instance.getJsonKey();
+    IBoundDefinitionModelComplex definition = instance.getDefinition();
+    return readComplexDefinitionObject(
+        parentItem,
+        definition,
+        jsonKey,
+        new PropertyBodyHandler(instance.getJsonProperties()),
+        getProblemHandler());
+  }
 
-    @Override
-    public Object readItemField(Object parentItem, IBoundDefinitionModelFieldComplex definition) throws IOException {
-      return readFieldObject(
-          parentItem,
-          definition,
-          definition.getJsonProperties(),
-          null,
-          getProblemHandler());
-    }
+  @Override
+  public IBoundObject readItemAssembly(IBoundObject parentItem, IBoundInstanceModelGroupedAssembly instance)
+      throws IOException {
+    return readComplexDefinitionObject(
+        parentItem,
+        instance.getDefinition(),
+        instance.getEffectiveJsonKey(),
+        new PropertyBodyHandler(instance.getJsonProperties()),
+        new GroupedInstanceProblemHandler(instance, getProblemHandler()));
+  }
 
-    @Override
-    public Object readItemFieldValue(Object parentItem, IBoundFieldValue fieldValue) throws IOException {
-      // read the field value's value
-      return readScalarItem(fieldValue);
-    }
+  @Override
+  public IBoundObject readItemAssembly(IBoundObject parentItem, IBoundDefinitionModelAssembly definition)
+      throws IOException {
+    return readComplexDefinitionObject(
+        parentItem,
+        definition,
+        null,
+        new PropertyBodyHandler(definition.getJsonProperties()),
+        getProblemHandler());
+  }
 
-    @Override
-    public Object readItemAssembly(Object parentItem, IBoundInstanceModelAssembly instance) throws IOException {
-      IBoundInstanceFlag jsonKey = instance.getJsonKey();
-      IBoundDefinitionModelComplex definition = instance.getDefinition();
-      return readComplexDefinitionObject(
+  @SuppressWarnings("resource")
+  @NonNull
+  private Object readScalarItem(@NonNull IFeatureScalarItemValueHandler handler)
+      throws IOException {
+    return handler.getJavaTypeAdapter().parse(getReader());
+  }
+
+  @NonNull
+  private IBoundObject readFieldObject(
+      @Nullable IBoundObject parentItem,
+      @NonNull IBoundDefinitionModelFieldComplex definition,
+      @NonNull Map<String, IBoundProperty<?>> jsonProperties,
+      @Nullable IBoundInstanceFlag jsonKey,
+      @NonNull IJsonProblemHandler problemHandler) throws IOException {
+    IBoundInstanceFlag jsonValueKey = definition.getJsonValueKeyFlagInstance();
+    IJsonProblemHandler actualProblemHandler = jsonValueKey == null
+        ? problemHandler
+        : new JsomValueKeyProblemHandler(problemHandler, jsonValueKey);
+
+    IBoundObject retval;
+    if (jsonProperties.isEmpty() && jsonValueKey == null) {
+      retval = readComplexDefinitionObject(
           parentItem,
           definition,
           jsonKey,
-          new PropertyBodyHandler(instance.getJsonProperties()),
-          getProblemHandler());
-    }
-
-    @Override
-    public Object readItemAssembly(Object parentItem, IBoundInstanceModelGroupedAssembly instance) throws IOException {
-      return readComplexDefinitionObject(
-          parentItem,
-          instance.getDefinition(),
-          instance.getJsonKey(),
-          new PropertyBodyHandler(instance.getJsonProperties()),
-          new GroupedInstanceProblemHandler(instance, getProblemHandler()));
-    }
+          (def, parent, problem) -> {
+            IBoundFieldValue fieldValue = definition.getFieldValue();
+            Object item = readItemFieldValue(parent, fieldValue);
+            fieldValue.setValue(parent, item);
+          },
+          actualProblemHandler);
 
-    @Override
-    public Object readItemAssembly(Object parentItem, IBoundDefinitionModelAssembly definition) throws IOException {
-      return readComplexDefinitionObject(
+    } else {
+      retval = readComplexDefinitionObject(
           parentItem,
           definition,
-          null,
-          new PropertyBodyHandler(definition.getJsonProperties()),
-          getProblemHandler());
+          jsonKey,
+          new PropertyBodyHandler(jsonProperties),
+          actualProblemHandler);
     }
+    return retval;
+  }
 
-    @SuppressWarnings("resource")
-    @NonNull
-    private Object readScalarItem(@NonNull IFeatureScalarItemValueHandler handler)
-        throws IOException {
-      return handler.getJavaTypeAdapter().parse(getReader());
-    }
+  @NonNull
+  private IBoundObject readComplexDefinitionObject(
+      @Nullable IBoundObject parentItem,
+      @NonNull IBoundDefinitionModelComplex definition,
+      @Nullable IBoundInstanceFlag jsonKey,
+      @NonNull DefinitionBodyHandler<IBoundDefinitionModelComplex> bodyHandler,
+      @NonNull IJsonProblemHandler problemHandler) throws IOException {
+    DefinitionBodyHandler<IBoundDefinitionModelComplex> actualBodyHandler = jsonKey == null
+        ? bodyHandler
+        : new JsonKeyBodyHandler(jsonKey, bodyHandler);
 
-    @NonNull
-    private Object readFieldObject(
-        @Nullable Object parentItem,
-        @NonNull IBoundDefinitionModelFieldComplex definition,
-        @NonNull Map<String, IBoundProperty> jsonProperties,
-        @Nullable IBoundInstanceFlag jsonKey,
-        @NonNull IJsonProblemHandler problemHandler) throws IOException {
-      IBoundInstanceFlag jsonValueKey = definition.getJsonValueKeyFlagInstance();
-      IJsonProblemHandler actualProblemHandler = jsonValueKey == null
-          ? problemHandler
-          : new JsomValueKeyProblemHandler(problemHandler, jsonValueKey);
-
-      Object retval;
-      if (jsonProperties.isEmpty() && jsonValueKey == null) {
-        retval = readComplexDefinitionObject(
-            parentItem,
-            definition,
-            jsonKey,
-            (def, parent, problem) -> {
-              IBoundFieldValue fieldValue = definition.getFieldValue();
-              Object item = readItemFieldValue(parent, fieldValue);
-              fieldValue.setValue(parent, item);
-            },
-            actualProblemHandler);
+    JsonLocation location = getReader().currentLocation();
 
-      } else {
-        retval = readComplexDefinitionObject(
-            parentItem,
-            definition,
-            jsonKey,
-            new PropertyBodyHandler(jsonProperties),
-            actualProblemHandler);
-      }
-      return retval;
-    }
+    // construct the item
+    IBoundObject item = definition.newInstance(
+        JsonLocation.NA.equals(location)
+            ? null
+            : () -> new MetaschemaData(location));
 
-    @SuppressWarnings("resource")
-    @Override
-    public Object readChoiceGroupItem(Object parentItem, IBoundInstanceModelChoiceGroup instance) throws IOException {
-      JsonParser parser = getReader();
-      ObjectNode node = parser.readValueAsTree();
-
-      String discriminatorProperty = instance.getJsonDiscriminatorProperty();
-      JsonNode discriminatorNode = node.get(discriminatorProperty);
-      if (discriminatorNode == null) {
-        throw new IllegalArgumentException(String.format(
-            "Unable to find discriminator property '%s' for object at '%s'.",
-            discriminatorProperty,
-            JsonUtil.toString(parser)));
-      }
-      String discriminator = ObjectUtils.requireNonNull(discriminatorNode.asText());
+    try {
+      // call pre-parse initialization hook
+      definition.callBeforeDeserialize(item, parentItem);
 
-      IBoundInstanceModelGroupedNamed actualInstance = instance.getGroupedModelInstance(discriminator);
-      assert actualInstance != null;
+      // read the property values
+      actualBodyHandler.accept(definition, item, problemHandler);
 
-      Object retval;
-      try (JsonParser newParser = node.traverse(parser.getCodec())) {
-        push(newParser);
+      // call post-parse initialization hook
+      definition.callAfterDeserialize(item, parentItem);
+    } catch (BindingException ex) {
+      throw new IOException(ex);
+    }
 
-        // get initial token
-        retval = actualInstance.readItem(parentItem, getItemReader());
-        assert newParser.currentToken() == null;
-        pop(newParser);
-      }
+    return item;
+  }
 
-      // advance the original parser to the next token
-      parser.nextToken();
+  @SuppressWarnings("resource")
+  @Override
+  public IBoundObject readChoiceGroupItem(IBoundObject parentItem, IBoundInstanceModelChoiceGroup instance)
+      throws IOException {
+    JsonParser parser = getReader();
+    ObjectNode node = parser.readValueAsTree();
 
-      return retval;
+    String discriminatorProperty = instance.getJsonDiscriminatorProperty();
+    JsonNode discriminatorNode = node.get(discriminatorProperty);
+    if (discriminatorNode == null) {
+      throw new IllegalArgumentException(String.format(
+          "Unable to find discriminator property '%s' for object at '%s'.",
+          discriminatorProperty,
+          JsonUtil.toString(parser)));
     }
+    String discriminator = ObjectUtils.requireNonNull(discriminatorNode.asText());
 
-    private final class JsonKeyBodyHandler implements DefinitionBodyHandler<IBoundDefinitionModelComplex> {
-      @NonNull
-      private final IBoundInstanceFlag jsonKey;
-      @NonNull
-      private final DefinitionBodyHandler<IBoundDefinitionModelComplex> bodyHandler;
-
-      private JsonKeyBodyHandler(
-          @NonNull IBoundInstanceFlag jsonKey,
-          @NonNull DefinitionBodyHandler<IBoundDefinitionModelComplex> bodyHandler) {
-        this.jsonKey = jsonKey;
-        this.bodyHandler = bodyHandler;
-      }
+    IBoundInstanceModelGroupedNamed actualInstance = instance.getGroupedModelInstance(discriminator);
+    assert actualInstance != null;
 
-      @Override
-      public void accept(IBoundDefinitionModelComplex definition, Object parentItem, IJsonProblemHandler problemHandler)
-          throws IOException {
-        @SuppressWarnings("resource")
-        JsonParser parser = getReader();
-        JsonUtil.assertCurrent(parser, JsonToken.FIELD_NAME);
+    IBoundObject retval;
+    try (JsonParser newParser = node.traverse(parser.getCodec())) {
+      push(newParser);
 
-        // the field will be the JSON key
-        String key = ObjectUtils.notNull(parser.currentName());
-        Object value = jsonKey.getDefinition().getJavaTypeAdapter().parse(key);
-        jsonKey.setValue(parentItem, ObjectUtils.notNull(value.toString()));
+      // get initial token
+      retval = actualInstance.readItem(parentItem, this);
+      assert newParser.currentToken() == null;
+      pop(newParser);
+    }
 
-        // skip to the next token
-        parser.nextToken();
-        // JsonUtil.assertCurrent(parser, JsonToken.START_OBJECT);
+    // advance the original parser to the next token
+    parser.nextToken();
 
-        // // advance past the JSON key's start object
-        // JsonUtil.assertAndAdvance(parser, JsonToken.START_OBJECT);
+    return retval;
+  }
 
-        // read the property values
-        bodyHandler.accept(definition, parentItem, problemHandler);
+  private final class JsonKeyBodyHandler implements DefinitionBodyHandler<IBoundDefinitionModelComplex> {
+    @NonNull
+    private final IBoundInstanceFlag jsonKey;
+    @NonNull
+    private final DefinitionBodyHandler<IBoundDefinitionModelComplex> bodyHandler;
 
-        // // advance past the JSON key's end object
-        // JsonUtil.assertAndAdvance(parser, JsonToken.END_OBJECT);
-      }
+    private JsonKeyBodyHandler(
+        @NonNull IBoundInstanceFlag jsonKey,
+        @NonNull DefinitionBodyHandler<IBoundDefinitionModelComplex> bodyHandler) {
+      this.jsonKey = jsonKey;
+      this.bodyHandler = bodyHandler;
     }
 
-    private final class PropertyBodyHandler implements DefinitionBodyHandler<IBoundDefinitionModelComplex> {
-      @NonNull
-      private final Map<String, IBoundProperty> jsonProperties;
+    @Override
+    public void accept(
+        IBoundDefinitionModelComplex definition,
+        IBoundObject parent,
+        IJsonProblemHandler problemHandler)
+        throws IOException {
+      @SuppressWarnings("resource") JsonParser parser = getReader();
+      JsonUtil.assertCurrent(parser, JsonToken.FIELD_NAME);
 
-      private PropertyBodyHandler(@NonNull Map<String, IBoundProperty> jsonProperties) {
-        this.jsonProperties = jsonProperties;
-      }
+      // the field will be the JSON key
+      String key = ObjectUtils.notNull(parser.currentName());
+      Object value = jsonKey.getDefinition().getJavaTypeAdapter().parse(key);
+      jsonKey.setValue(parent, ObjectUtils.notNull(value.toString()));
 
-      @Override
-      public void accept(
-          IBoundDefinitionModelComplex definition,
-          Object parentItem,
-          IJsonProblemHandler problemHandler)
-          throws IOException {
-        @SuppressWarnings("resource")
-        JsonParser parser = getReader();
+      // skip to the next token
+      parser.nextToken();
+      // JsonUtil.assertCurrent(parser, JsonToken.START_OBJECT);
 
-        // advance past the start object
-        JsonUtil.assertAndAdvance(parser, JsonToken.START_OBJECT);
+      // // advance past the JSON key's start object
+      // JsonUtil.assertAndAdvance(parser, JsonToken.START_OBJECT);
 
-        // make a copy, since we use the remaining values to initialize default values
-        Map<String, IBoundProperty> remainingInstances = new HashMap<>(jsonProperties); // NOPMD not concurrent
+      // read the property values
+      bodyHandler.accept(definition, parent, problemHandler);
 
-        // handle each property
-        while (JsonToken.FIELD_NAME.equals(parser.currentToken())) {
+      // // advance past the JSON key's end object
+      // JsonUtil.assertAndAdvance(parser, JsonToken.END_OBJECT);
+    }
+  }
 
-          // the parser's current token should be the JSON field name
-          String propertyName = ObjectUtils.notNull(parser.currentName());
-          if (LOGGER.isTraceEnabled()) {
-            LOGGER.trace("reading property {}", propertyName);
-          }
+  private final class PropertyBodyHandler implements DefinitionBodyHandler<IBoundDefinitionModelComplex> {
+    @NonNull
+    private final Map<String, IBoundProperty<?>> jsonProperties;
 
-          IBoundProperty property = remainingInstances.get(propertyName);
+    private PropertyBodyHandler(@NonNull Map<String, IBoundProperty<?>> jsonProperties) {
+      this.jsonProperties = jsonProperties;
+    }
 
-          boolean handled = false;
-          if (property != null) {
-            // advance past the field name
-            parser.nextToken();
+    @Override
+    public void accept(
+        IBoundDefinitionModelComplex definition,
+        IBoundObject parent,
+        IJsonProblemHandler problemHandler)
+        throws IOException {
+      @SuppressWarnings("resource") JsonParser parser = getReader();
 
-            Object value = property.readItem(parentItem, getInstanceReader());
-            property.setValue(parentItem, value);
+      // advance past the start object
+      JsonUtil.assertAndAdvance(parser, JsonToken.START_OBJECT);
 
-            // mark handled
-            remainingInstances.remove(propertyName);
-            handled = true;
-          }
+      // make a copy, since we use the remaining values to initialize default values
+      Map<String, IBoundProperty<?>> remainingInstances = new HashMap<>(jsonProperties); // NOPMD not concurrent
 
-          if (!(handled || problemHandler.handleUnknownProperty(
-              definition,
-              parentItem,
-              propertyName,
-              getInstanceReader()))) {
-            if (LOGGER.isWarnEnabled()) {
-              LOGGER.warn("Skipping unhandled JSON field '{}' {}.", propertyName, JsonUtil.toString(parser));
-            }
-            JsonUtil.assertAndAdvance(parser, JsonToken.FIELD_NAME);
-            JsonUtil.skipNextValue(parser);
-          }
+      // handle each property
+      while (JsonToken.FIELD_NAME.equals(parser.currentToken())) {
 
-          // the current token will be either the next instance field name or the end of
-          // the parent object
-          JsonUtil.assertCurrent(parser, JsonToken.FIELD_NAME, JsonToken.END_OBJECT);
+        // the parser's current token should be the JSON field name
+        String propertyName = ObjectUtils.notNull(parser.currentName());
+        if (LOGGER.isTraceEnabled()) {
+          LOGGER.trace("reading property {}", propertyName);
         }
 
-        problemHandler.handleMissingInstances(
-            definition,
-            parentItem,
-            ObjectUtils.notNull(remainingInstances.values()));
+        IBoundProperty<?> property = remainingInstances.get(propertyName);
 
-        // advance past the end object
-        JsonUtil.assertAndAdvance(parser, JsonToken.END_OBJECT);
-      }
-    }
+        boolean handled = false;
+        if (property != null) {
+          // advance past the field name
+          parser.nextToken();
 
-    private final class GroupedInstanceProblemHandler implements IJsonProblemHandler {
-      @NonNull
-      private final IBoundInstanceModelGroupedNamed instance;
-      @NonNull
-      private final IJsonProblemHandler delegate;
-
-      private GroupedInstanceProblemHandler(
-          @NonNull IBoundInstanceModelGroupedNamed instance,
-          @NonNull IJsonProblemHandler delegate) {
-        this.instance = instance;
-        this.delegate = delegate;
-      }
+          Object value = readObjectProperty(parent, property);
+          property.setValue(parent, value);
 
-      @Override
-      public void handleMissingInstances(IBoundDefinitionModel parentDefinition, Object targetObject,
-          Collection<? extends IBoundProperty> unhandledInstances) throws IOException {
-        delegate.handleMissingInstances(parentDefinition, targetObject, unhandledInstances);
-      }
+          // mark handled
+          remainingInstances.remove(propertyName);
+          handled = true;
+        }
 
-      @SuppressWarnings("resource")
-      @Override
-      public boolean handleUnknownProperty(
-          IBoundDefinitionModelComplex definition,
-          Object parentItem,
-          String fieldName,
-          IInstanceReader reader) throws IOException {
-        JsonParser parser = reader.getJsonParser();
-        boolean retval;
-        if (instance.getParentContainer().getJsonDiscriminatorProperty().equals(fieldName)) {
+        if (!handled && !problemHandler.handleUnknownProperty(
+            definition,
+            parent,
+            propertyName,
+            getReader())) {
+          if (LOGGER.isWarnEnabled()) {
+            LOGGER.warn("Skipping unhandled JSON field '{}' {}.", propertyName, JsonUtil.toString(parser));
+          }
+          JsonUtil.assertAndAdvance(parser, JsonToken.FIELD_NAME);
           JsonUtil.skipNextValue(parser);
-          retval = true;
-        } else {
-          retval = delegate.handleUnknownProperty(definition, parentItem, fieldName, reader);
         }
-        return retval;
-      }
-    }
 
-    private final class JsomValueKeyProblemHandler implements IJsonProblemHandler {
-      @NonNull
-      private final IJsonProblemHandler delegate;
-      @NonNull
-      private final IBoundInstanceFlag jsonValueKyeFlag;
-      private boolean foundJsonValueKey; // false
-
-      private JsomValueKeyProblemHandler(
-          @NonNull IJsonProblemHandler delegate,
-          @NonNull IBoundInstanceFlag jsonValueKyeFlag) {
-        this.delegate = delegate;
-        this.jsonValueKyeFlag = jsonValueKyeFlag;
+        // the current token will be either the next instance field name or the end of
+        // the parent object
+        JsonUtil.assertCurrent(parser, JsonToken.FIELD_NAME, JsonToken.END_OBJECT);
       }
 
-      @Override
-      public void handleMissingInstances(IBoundDefinitionModel parentDefinition, Object targetObject,
-          Collection<? extends IBoundProperty> unhandledInstances) throws IOException {
-        delegate.handleMissingInstances(parentDefinition, targetObject, unhandledInstances);
-      }
+      problemHandler.handleMissingInstances(
+          definition,
+          parent,
+          ObjectUtils.notNull(remainingInstances.values()));
 
-      @Override
-      public boolean handleUnknownProperty(IBoundDefinitionModelComplex definition, Object parentItem, String fieldName,
-          IInstanceReader reader) throws IOException {
-        boolean retval;
-        if (foundJsonValueKey) {
-          retval = delegate.handleUnknownProperty(definition, parentItem, fieldName, reader);
-        } else {
-          @SuppressWarnings("resource")
-          JsonParser parser = getReader();
-          // handle JSON value key
-          String key = ObjectUtils.notNull(parser.getCurrentName());
-          Object keyValue = jsonValueKyeFlag.getJavaTypeAdapter().parse(key);
-          jsonValueKyeFlag.setValue(ObjectUtils.notNull(parentItem), keyValue);
+      // advance past the end object
+      JsonUtil.assertAndAdvance(parser, JsonToken.END_OBJECT);
+    }
+  }
 
-          // advance past the field name
-          JsonUtil.assertAndAdvance(parser, JsonToken.FIELD_NAME);
+  private final class GroupedInstanceProblemHandler implements IJsonProblemHandler {
+    @NonNull
+    private final IBoundInstanceModelGroupedNamed instance;
+    @NonNull
+    private final IJsonProblemHandler delegate;
 
-          IBoundFieldValue fieldValue = ((IBoundDefinitionModelFieldComplex) definition).getFieldValue();
-          Object value = getItemReader().readItemFieldValue(
-              ObjectUtils.notNull(parentItem),
-              fieldValue);
-          fieldValue.setValue(ObjectUtils.notNull(parentItem), value);
+    private GroupedInstanceProblemHandler(
+        @NonNull IBoundInstanceModelGroupedNamed instance,
+        @NonNull IJsonProblemHandler delegate) {
+      this.instance = instance;
+      this.delegate = delegate;
+    }
 
-          retval = foundJsonValueKey = true;
-        }
-        return retval;
-      }
+    @Override
+    public void handleMissingInstances(
+        IBoundDefinitionModelComplex parentDefinition,
+        IBoundObject targetObject,
+        Collection<? extends IBoundProperty<?>> unhandledInstances) throws IOException {
+      delegate.handleMissingInstances(parentDefinition, targetObject, unhandledInstances);
+    }
 
+    @SuppressWarnings("resource")
+    @Override
+    public boolean handleUnknownProperty(
+        IBoundDefinitionModelComplex definition,
+        IBoundObject parentItem,
+        String fieldName,
+        JsonParser parser) throws IOException {
+      boolean retval;
+      if (instance.getParentContainer().getJsonDiscriminatorProperty().equals(fieldName)) {
+        JsonUtil.skipNextValue(parser);
+        retval = true;
+      } else {
+        retval = delegate.handleUnknownProperty(definition, parentItem, fieldName, getReader());
+      }
+      return retval;
     }
+  }
 
+  private final class JsomValueKeyProblemHandler implements IJsonProblemHandler {
     @NonNull
-    private Object readComplexDefinitionObject(
-        @Nullable Object parentItem,
-        @NonNull IBoundDefinitionModelComplex definition,
-        @Nullable IBoundInstanceFlag jsonKey,
-        @NonNull DefinitionBodyHandler<IBoundDefinitionModelComplex> bodyHandler,
-        @NonNull IJsonProblemHandler problemHandler) throws IOException {
-      DefinitionBodyHandler<IBoundDefinitionModelComplex> actualBodyHandler = jsonKey == null
-          ? bodyHandler
-          : new JsonKeyBodyHandler(jsonKey, bodyHandler);
-
-      // construct the item
-      Object item = definition.newInstance();
-
-      try {
-        // call pre-parse initialization hook
-        definition.callBeforeDeserialize(item, parentItem);
-
-        // read the property values
-        actualBodyHandler.accept(definition, item, problemHandler);
-
-        // call post-parse initialization hook
-        definition.callAfterDeserialize(item, parentItem);
-      } catch (BindingException ex) {
-        throw new IOException(ex);
-      }
+    private final IJsonProblemHandler delegate;
+    @NonNull
+    private final IBoundInstanceFlag jsonValueKyeFlag;
+    private boolean foundJsonValueKey; // false
+
+    private JsomValueKeyProblemHandler(
+        @NonNull IJsonProblemHandler delegate,
+        @NonNull IBoundInstanceFlag jsonValueKyeFlag) {
+      this.delegate = delegate;
+      this.jsonValueKyeFlag = jsonValueKyeFlag;
+    }
+
+    @Override
+    public void handleMissingInstances(
+        IBoundDefinitionModelComplex parentDefinition,
+        IBoundObject targetObject,
+        Collection<? extends IBoundProperty<?>> unhandledInstances) throws IOException {
+      delegate.handleMissingInstances(parentDefinition, targetObject, unhandledInstances);
+    }
+
+    @Override
+    public boolean handleUnknownProperty(
+        IBoundDefinitionModelComplex definition,
+        IBoundObject parentItem,
+        String fieldName,
+        JsonParser parser) throws IOException {
+      boolean retval;
+      if (foundJsonValueKey) {
+        retval = delegate.handleUnknownProperty(definition, parentItem, fieldName, parser);
+      } else {
+        // handle JSON value key
+        String key = ObjectUtils.notNull(parser.getCurrentName());
+        Object keyValue = jsonValueKyeFlag.getJavaTypeAdapter().parse(key);
+        jsonValueKyeFlag.setValue(ObjectUtils.notNull(parentItem), keyValue);
 
-      return item;
+        // advance past the field name
+        JsonUtil.assertAndAdvance(parser, JsonToken.FIELD_NAME);
+
+        IBoundFieldValue fieldValue = ((IBoundDefinitionModelFieldComplex) definition).getFieldValue();
+        Object value = readItemFieldValue(
+            ObjectUtils.notNull(parentItem),
+            fieldValue);
+        fieldValue.setValue(ObjectUtils.notNull(parentItem), value);
+
+        retval = foundJsonValueKey = true;
+      }
+      return retval;
     }
+
   }
 
-  private class ModelInstanceReadHandler
-      extends AbstractModelInstanceReadHandler {
+  private class ModelInstanceReadHandler<ITEM>
+      extends AbstractModelInstanceReadHandler<ITEM> {
 
     protected ModelInstanceReadHandler(
-        @NonNull IBoundInstanceModel instance,
-        @NonNull Object parentItem,
-        @SuppressWarnings("unused") @NonNull IJsonParsingContext.ItemReader itemReader) {
+        @NonNull IBoundInstanceModel<ITEM> instance,
+        @NonNull IBoundObject parentItem) {
       super(instance, parentItem);
     }
 
     @SuppressWarnings("resource") // no need to close parser
     @Override
-    public List<?> readList() throws IOException {
+    public List<ITEM> readList() throws IOException {
       JsonParser parser = getReader();
 
-      List<Object> items = new LinkedList<>();
+      List<ITEM> items = new LinkedList<>();
       switch (parser.currentToken()) {
       case START_ARRAY:
         // this is an array, we need to parse the array wrapper then each item
@@ -698,13 +734,12 @@ public List<?> readList() throws IOException {
 
     @SuppressWarnings("resource") // no need to close parser
     @Override
-    public Map<String, ?> readMap() throws IOException {
+    public Map<String, ITEM> readMap() throws IOException {
       JsonParser parser = getReader();
 
-      IBoundInstanceModel instance = getCollectionInfo().getInstance();
+      IBoundInstanceModel<?> instance = getCollectionInfo().getInstance();
 
-      @SuppressWarnings("PMD.UseConcurrentHashMap")
-      Map<String, Object> items = new LinkedHashMap<>();
+      @SuppressWarnings("PMD.UseConcurrentHashMap") Map<String, ITEM> items = new LinkedHashMap<>();
 
       // A map value is always wrapped in a START_OBJECT, since fields are used for
       // the keys
@@ -716,7 +751,7 @@ public List<?> readList() throws IOException {
         // a map item will always start with a FIELD_NAME, since this represents the key
         JsonUtil.assertCurrent(parser, JsonToken.FIELD_NAME);
 
-        Object item = readItem();
+        ITEM item = readItem();
 
         // lookup the key
         IBoundInstanceFlag jsonKey = instance.getItemJsonKey(item);
@@ -744,79 +779,51 @@ public List<?> readList() throws IOException {
 
     @Override
     @NonNull
-    public Object readItem() throws IOException {
-      IBoundInstanceModel instance = getCollectionInfo().getInstance();
-      return instance.readItem(getParentObject(), getItemReader());
+    public ITEM readItem() throws IOException {
+      IBoundInstanceModel<ITEM> instance = getCollectionInfo().getInstance();
+      return instance.readItem(getParentObject(), MetaschemaJsonReader.this);
     }
-
   }
 
-  @SuppressWarnings("unchecked")
-  @NonNull
-  public <T> T readObject(@NonNull IBoundDefinitionModelComplex definition) throws IOException {
-    return (T) definition.readItem(null, getInstanceReader());
-  }
-
-  @SuppressWarnings({ "unchecked", "resource" })
-  @NonNull
-  public <T> T readProperty(
-      @NonNull IBoundDefinitionModelComplex definition,
-      @NonNull String expectedFieldName) throws IOException {
-    JsonParser parser = getReader();
+  private static class MetaschemaData implements IMetaschemaData {
+    private final int line;
+    private final int column;
+    private final long charOffset;
+    private final long byteOffset;
 
-    boolean hasStartObject = JsonToken.START_OBJECT.equals(parser.currentToken());
-    if (hasStartObject) {
-      // advance past the start object
-      JsonUtil.assertAndAdvance(parser, JsonToken.START_OBJECT);
+    public MetaschemaData(@NonNull JsonLocation location) {
+      this.line = location.getLineNr();
+      this.column = location.getColumnNr();
+      this.charOffset = location.getCharOffset();
+      this.byteOffset = location.getByteOffset();
     }
 
-    T retval = null;
-    JsonToken token;
-    while (!(JsonToken.END_OBJECT.equals(token = parser.currentToken()) || token == null)) {
-      if (!JsonToken.FIELD_NAME.equals(token)) {
-        throw new IOException(String.format("Expected FIELD_NAME token, found '%s'", token.toString()));
-      }
-
-      String propertyName = ObjectUtils.notNull(parser.currentName());
-      if (expectedFieldName.equals(propertyName)) {
-        // process the object value, bound to the requested class
-        JsonUtil.assertAndAdvance(parser, JsonToken.FIELD_NAME);
-
-        // stop now, since we found the field
-        retval = (T) definition.readItem(null, getInstanceReader());
-        break;
-      }
+    @Override
+    public int getLine() {
+      return line;
+    }
 
-      if (!getProblemHandler().handleUnknownProperty(
-          definition,
-          null,
-          propertyName,
-          getInstanceReader())) {
-        if (LOGGER.isWarnEnabled()) {
-          LOGGER.warn("Skipping unhandled JSON field '{}'{}.", propertyName, JsonUtil.toString(parser));
-        }
-        JsonUtil.skipNextValue(parser);
-      }
+    @Override
+    public int getColumn() {
+      return column;
     }
 
-    if (hasStartObject) {
-      // advance past the end object
-      JsonUtil.assertAndAdvance(parser, JsonToken.END_OBJECT);
+    @Override
+    public long getCharOffset() {
+      return charOffset;
     }
 
-    if (retval == null) {
-      throw new IOException(String.format("Failed to find property with name '%s'%s.",
-          expectedFieldName,
-          JsonUtil.generateLocationMessage(parser)));
+    @Override
+    public long getByteOffset() {
+      return byteOffset;
     }
-    return retval;
   }
 
   @FunctionalInterface
   private interface DefinitionBodyHandler<DEF extends IBoundDefinitionModelComplex> {
     void accept(
         @NonNull DEF definition,
-        @NonNull Object item,
+        @NonNull IBoundObject parent,
         @NonNull IJsonProblemHandler problemHandler) throws IOException;
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonUtil.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonUtil.java
index 0d9a3ff62..68142486b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonUtil.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonUtil.java
@@ -70,17 +70,17 @@ private MetaschemaJsonUtil() {
    * @return a mapping of JSON property to related Module instance
    */
   @NonNull
-  public static Map<String, ? extends IBoundProperty> getJsonInstanceMap(
-      @NonNull IBoundDefinitionModel targetDefinition,
+  public static Map<String, ? extends IBoundProperty<?>> getJsonInstanceMap(
+      @NonNull IBoundDefinitionModel<?> targetDefinition,
       @Nullable IBoundInstanceFlag jsonKey) {
     Collection<? extends IBoundInstanceFlag> flags = targetDefinition.getFlagInstances();
     int flagCount = flags.size() - (jsonKey == null ? 0 : 1);
 
-    @SuppressWarnings("resource") Stream<? extends IBoundProperty> instanceStream;
+    Stream<? extends IBoundProperty<?>> instanceStream;
     if (targetDefinition instanceof IBoundDefinitionModelAssembly) {
       // use all child instances
       instanceStream = ((IBoundDefinitionModelAssembly) targetDefinition).getModelInstances().stream()
-          .map(instance -> (IBoundProperty) instance);
+          .map(instance -> (IBoundProperty<?>) instance);
     } else if (targetDefinition instanceof IBoundDefinitionModelFieldComplex) {
       IBoundDefinitionModelFieldComplex targetFieldDefinition = (IBoundDefinitionModelFieldComplex) targetDefinition;
 
@@ -100,7 +100,7 @@ private MetaschemaJsonUtil() {
 
     if (jsonKey != null) {
       instanceStream = Stream.concat(
-          flags.stream().filter((flag) -> !jsonKey.equals(flag)),
+          flags.stream().filter(flag -> !jsonKey.equals(flag)),
           instanceStream);
     } else {
       instanceStream = Stream.concat(
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonWriter.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonWriter.java
index 4c35a492b..095d46204 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonWriter.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/json/MetaschemaJsonWriter.java
@@ -28,10 +28,13 @@
 
 import com.fasterxml.jackson.core.JsonGenerator;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue;
+import gov.nist.secauto.metaschema.databind.model.IBoundInstance;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly;
@@ -53,11 +56,9 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public class MetaschemaJsonWriter implements IJsonWritingContext {
+public class MetaschemaJsonWriter implements IJsonWritingContext, IItemWriteHandler {
   @NonNull
-  private final JsonGenerator writer;
-  @NonNull
-  private final ItemWriter itemWriter = new ItemWriter();
+  private final JsonGenerator generator;
 
   /**
    * Construct a new Module-aware JSON writer.
@@ -67,46 +68,56 @@ public class MetaschemaJsonWriter implements IJsonWritingContext {
    * @see DefaultJsonProblemHandler
    */
   public MetaschemaJsonWriter(@NonNull JsonGenerator generator) {
-    this.writer = generator;
+    this.generator = generator;
   }
 
   @Override
   public JsonGenerator getWriter() {
-    return writer;
-  }
-
-  @NonNull
-  protected ItemWriter getItemWriter() {
-    return itemWriter;
-  }
-
-  @Override
-  public void writeItemFlag(Object parentItem, IBoundInstanceFlag instance) throws IOException {
-    writeInstance(instance, parentItem);
+    return generator;
   }
 
-  @Override
-  public void writeItemField(Object parentItem, IBoundInstanceModelFieldScalar instance) throws IOException {
-    writeModelInstance(instance, parentItem);
-  }
+  // =====================================
+  // Entry point for top-level-definitions
+  // =====================================
 
   @Override
-  public void writeItemField(Object parentItem, IBoundInstanceModelFieldComplex instance) throws IOException {
-    writeModelInstance(instance, parentItem);
+  public void write(
+      @NonNull IBoundDefinitionModelComplex definition,
+      @NonNull IBoundObject item) throws IOException {
+    definition.writeItem(item, this);
   }
 
-  @Override
-  public void writeItemField(Object parentItem, IBoundInstanceModelGroupedField instance) throws IOException {
-    throw new UnsupportedOperationException("not needed");
+  // ================
+  // Instance writers
+  // ================
+
+  private <T> void writeInstance(
+      @NonNull IBoundProperty<T> instance,
+      @NonNull IBoundObject parentItem) throws IOException {
+    @SuppressWarnings("unchecked") T value = (T) instance.getValue(parentItem);
+    if (value != null && !value.equals(instance.getResolvedDefaultValue())) {
+      generator.writeFieldName(instance.getJsonName());
+      instance.writeItem(value, this);
+    }
   }
 
-  @Override
-  public void writeItemField(Object item, IBoundDefinitionModelFieldComplex definition) throws IOException {
-    definition.writeItem(item, getItemWriter());
+  private <T> void writeModelInstance(
+      @NonNull IBoundInstanceModel<T> instance,
+      @NonNull Object parentItem) throws IOException {
+    Object value = instance.getValue(parentItem);
+    if (value != null) {
+      // this if is not strictly needed, since isEmpty will return false on a null
+      // value
+      // checking null here potentially avoids the expensive operation of instatiating
+      IModelInstanceCollectionInfo<T> collectionInfo = instance.getCollectionInfo();
+      if (!collectionInfo.isEmpty(value)) {
+        generator.writeFieldName(instance.getJsonName());
+        collectionInfo.writeItems(new ModelInstanceWriteHandler<>(instance), value);
+      }
+    }
   }
 
-  @Override
-  public void writeItemFieldValue(Object parentItem, IBoundFieldValue fieldValue) throws IOException {
+  private void writeFieldValue(@NonNull IBoundFieldValue fieldValue, @NonNull Object parentItem) throws IOException {
     Object item = fieldValue.getValue(parentItem);
 
     // handle json value key
@@ -137,237 +148,213 @@ public void writeItemFieldValue(Object parentItem, IBoundFieldValue fieldValue)
       } else {
         valueKeyName = fieldValue.getParentFieldDefinition().getEffectiveJsonValueKeyName();
       }
-      writer.writeFieldName(valueKeyName);
+      generator.writeFieldName(valueKeyName);
       // LOGGER.info("FIELD: {}", valueKeyName);
 
-      getItemWriter().writeItemFieldValue(item, fieldValue);
+      writeItemFieldValue(item, fieldValue);
     }
   }
 
   @Override
-  public void writeItemAssembly(Object parentItem, IBoundInstanceModelAssembly instance) throws IOException {
-    writeModelInstance(instance, parentItem);
+  public void writeItemFlag(Object item, IBoundInstanceFlag instance) throws IOException {
+    writeScalarItem(item, instance);
   }
 
   @Override
-  public void writeItemAssembly(Object parentItem, IBoundInstanceModelGroupedAssembly instance) throws IOException {
-    throw new UnsupportedOperationException("not needed");
+  public void writeItemField(Object item, IBoundInstanceModelFieldScalar instance) throws IOException {
+    writeScalarItem(item, instance);
   }
 
   @Override
-  public void writeItemAssembly(Object item, IBoundDefinitionModelAssembly definition) throws IOException {
-    definition.writeItem(item, getItemWriter());
+  public void writeItemField(IBoundObject item, IBoundInstanceModelFieldComplex instance) throws IOException {
+    writeModelObject(
+        instance,
+        item,
+        this::writeObjectProperties);
   }
 
   @Override
-  public void writeChoiceGroupItem(Object parentItem, IBoundInstanceModelChoiceGroup instance) throws IOException {
-    writeModelInstance(instance, parentItem);
+  public void writeItemField(IBoundObject item, IBoundInstanceModelGroupedField instance) throws IOException {
+    writeGroupedModelObject(
+        instance,
+        item,
+        ((ObjectWriter<IBoundInstanceModelGroupedField>) this::writeDiscriminatorProperty)
+            .andThen(this::writeObjectProperties));
   }
 
-  private void writeInstance(
-      @NonNull IBoundProperty instance,
-      @NonNull Object parentItem) throws IOException {
-    Object value = instance.getValue(parentItem);
-    if (!(value == null || value.equals(instance.getResolvedDefaultValue()))) {
-      writer.writeFieldName(instance.getJsonName());
-      instance.writeItem(value, getItemWriter());
-    }
+  @Override
+  public void writeItemField(IBoundObject item, IBoundDefinitionModelFieldComplex definition) throws IOException {
+    writeDefinitionObject(
+        definition,
+        item,
+        (ObjectWriter<IBoundDefinitionModelFieldComplex>) this::writeObjectProperties);
   }
 
-  private void writeModelInstance(
-      @NonNull IBoundInstanceModel instance,
-      @NonNull Object parentItem) throws IOException {
-    Object value = instance.getValue(parentItem);
-    if (value != null) {
-      // this if is not strictly needed, since isEmpty will return false on a null
-      // value
-      // checking null here potentially avoids the expensive operation of instatiating
-      IModelInstanceCollectionInfo collectionInfo = instance.getCollectionInfo();
-      if (!collectionInfo.isEmpty(value)) {
-        writer.writeFieldName(instance.getJsonName());
-        collectionInfo.writeItems(new ModelInstanceWriteHandler(instance), value);
-      }
-    }
+  @Override
+  public void writeItemFieldValue(Object item, IBoundFieldValue fieldValue) throws IOException {
+    fieldValue.getJavaTypeAdapter().writeJsonValue(item, generator);
   }
 
-  private final class ItemWriter implements IItemWriteHandler {
-    @Override
-    public void writeItemFlag(Object item, IBoundInstanceFlag instance) throws IOException {
-      writeScalarItem(item, instance);
-    }
-
-    @Override
-    public void writeItemField(Object item, IBoundInstanceModelFieldScalar instance) throws IOException {
-      writeScalarItem(item, instance);
-    }
+  @Override
+  public void writeItemAssembly(IBoundObject item, IBoundInstanceModelAssembly instance) throws IOException {
+    writeModelObject(instance, item, this::writeObjectProperties);
+  }
 
-    @Override
-    public void writeItemField(Object item, IBoundInstanceModelFieldComplex instance) throws IOException {
-      writeModelObject(
-          instance,
-          item,
-          this::writeObjectProperties);
-    }
+  @Override
+  public void writeItemAssembly(IBoundObject item, IBoundInstanceModelGroupedAssembly instance) throws IOException {
+    writeGroupedModelObject(
+        instance,
+        item,
+        ((ObjectWriter<IBoundInstanceModelGroupedAssembly>) this::writeDiscriminatorProperty)
+            .andThen(this::writeObjectProperties));
+  }
 
-    @Override
-    public void writeItemField(Object item, IBoundInstanceModelGroupedField instance) throws IOException {
-      writeGroupedModelObject(
-          instance,
-          item,
-          ((ObjectWriter<IBoundInstanceModelGroupedField>) this::writeDiscriminatorProperty)
-              .andThen(this::writeObjectProperties));
-    }
+  @Override
+  public void writeItemAssembly(IBoundObject item, IBoundDefinitionModelAssembly definition) throws IOException {
+    writeDefinitionObject(definition, item, this::writeObjectProperties);
+  }
 
-    @Override
-    public void writeItemField(Object item, IBoundDefinitionModelFieldComplex definition) throws IOException {
-      writeDefinitionObject(
-          definition,
-          item,
-          (ObjectWriter<IBoundDefinitionModelFieldComplex>) this::writeObjectProperties);
-    }
+  @Override
+  public void writeChoiceGroupItem(IBoundObject item, IBoundInstanceModelChoiceGroup instance) throws IOException {
+    IBoundInstanceModelGroupedNamed actualInstance = instance.getItemInstance(item);
+    assert actualInstance != null;
+    actualInstance.writeItem(item, this);
+  }
 
-    @Override
-    public void writeItemFieldValue(Object item, IBoundFieldValue fieldValue) throws IOException {
-      fieldValue.getJavaTypeAdapter().writeJsonValue(item, writer);
-    }
+  /**
+   * Writes a scalar item.
+   *
+   * @param item
+   *          the item to write
+   * @param handler
+   *          the value handler
+   * @throws IOException
+   *           if an error occurred while writing the scalar value
+   */
+  private void writeScalarItem(@NonNull Object item, @NonNull IFeatureScalarItemValueHandler handler)
+      throws IOException {
+    handler.getJavaTypeAdapter().writeJsonValue(item, generator);
+  }
 
-    @Override
-    public void writeItemAssembly(Object item, IBoundInstanceModelAssembly instance) throws IOException {
-      writeModelObject(instance, item, this::writeObjectProperties);
-    }
+  private <T extends IBoundInstanceModelGroupedNamed> void writeDiscriminatorProperty(
+      @NonNull Object parentItem,
+      @NonNull T instance) throws IOException {
 
-    @Override
-    public void writeItemAssembly(Object item, IBoundInstanceModelGroupedAssembly instance) throws IOException {
-      writeGroupedModelObject(
-          instance,
-          item,
-          ((ObjectWriter<IBoundInstanceModelGroupedAssembly>) this::writeDiscriminatorProperty)
-              .andThen(this::writeObjectProperties));
-    }
+    IBoundInstanceModelChoiceGroup choiceGroup = instance.getParentContainer();
 
-    @Override
-    public void writeItemAssembly(Object item, IBoundDefinitionModelAssembly definition) throws IOException {
-      writeDefinitionObject(definition, item, this::writeObjectProperties);
-    }
+    // write JSON object discriminator
+    String discriminatorProperty = choiceGroup.getJsonDiscriminatorProperty();
+    String discriminatorValue = instance.getEffectiveDisciminatorValue();
 
-    @Override
-    public void writeChoiceGroupItem(Object item, IBoundInstanceModelChoiceGroup instance) throws IOException {
-      IBoundInstanceModelGroupedNamed actualInstance = instance.getItemInstance(item);
-      assert actualInstance != null;
-      actualInstance.writeItem(item, this);
-    }
+    generator.writeStringField(discriminatorProperty, discriminatorValue);
+  }
 
-    private void writeScalarItem(@NonNull Object item, @NonNull IFeatureScalarItemValueHandler handler)
-        throws IOException {
-      handler.getJavaTypeAdapter().writeJsonValue(item, writer);
+  private <T extends IFeatureComplexItemValueHandler> void writeObjectProperties(
+      @NonNull IBoundObject parent,
+      @NonNull T handler) throws IOException {
+    for (IBoundProperty<?> property : handler.getJsonProperties().values()) {
+      assert property != null;
+
+      if (property instanceof IBoundInstanceModel) {
+        writeModelInstance((IBoundInstanceModel<?>) property, parent);
+      } else if (property instanceof IBoundInstance) {
+        writeInstance(property, parent);
+      } else { // IBoundFieldValue
+        writeFieldValue((IBoundFieldValue) property, parent);
+      }
     }
+  }
 
-    private <T extends IBoundInstanceModelGroupedNamed> void writeDiscriminatorProperty(
-        @NonNull Object parentItem,
-        @NonNull T instance) throws IOException {
-
-      IBoundInstanceModelChoiceGroup choiceGroup = instance.getParentContainer();
-
-      // write JSON object discriminator
-      String discriminatorProperty = choiceGroup.getJsonDiscriminatorProperty();
-      String discriminatorValue = instance.getEffectiveDisciminatorValue();
+  private <T extends IFeatureComplexItemValueHandler> void writeDefinitionObject(
+      @NonNull T handler,
+      @NonNull IBoundObject parent,
+      @NonNull ObjectWriter<T> propertyWriter) throws IOException {
+    generator.writeStartObject();
 
-      writer.writeStringField(discriminatorProperty, discriminatorValue);
-    }
+    propertyWriter.accept(parent, handler);
+    generator.writeEndObject();
+  }
 
-    private <T extends IFeatureComplexItemValueHandler> void writeObjectProperties(
-        @NonNull Object parentItem,
-        @NonNull T handler) throws IOException {
-      for (IBoundProperty instance : handler.getJsonProperties().values()) {
-        assert instance != null;
-        instance.writeItem(parentItem, MetaschemaJsonWriter.this);
+  private <T extends IFeatureComplexItemValueHandler & IBoundInstanceModel<IBoundObject>>
+      void writeModelObject(
+          @NonNull T handler,
+          @NonNull IBoundObject parent,
+          @NonNull ObjectWriter<T> propertyWriter) throws IOException {
+    generator.writeStartObject();
+
+    IBoundInstanceFlag jsonKey = handler.getItemJsonKey(parent);
+    if (jsonKey != null) {
+      Object keyValue = jsonKey.getValue(parent);
+      if (keyValue == null) {
+        throw new IOException(String.format("Null value for json-key for definition '%s'",
+            jsonKey.getContainingDefinition().toCoordinates()));
       }
-    }
 
-    private <T extends IFeatureComplexItemValueHandler> void writeDefinitionObject(
-        @NonNull T handler,
-        @NonNull Object parentItem,
-        @NonNull ObjectWriter<T> propertyWriter) throws IOException {
-      writer.writeStartObject();
+      // the field will be the JSON key value
+      String key = jsonKey.getJavaTypeAdapter().asString(keyValue);
+      generator.writeFieldName(key);
 
-      propertyWriter.accept(parentItem, handler);
-      writer.writeEndObject();
+      // next the value will be a start object
+      generator.writeStartObject();
     }
 
-    private <T extends IFeatureComplexItemValueHandler & IBoundInstanceModel> void writeModelObject(
-        @NonNull T handler,
-        @NonNull Object parentItem,
-        @NonNull ObjectWriter<T> propertyWriter) throws IOException {
-      writer.writeStartObject();
+    propertyWriter.accept(parent, handler);
 
-      IBoundInstanceFlag jsonKey = handler.getItemJsonKey(parentItem);
-      if (jsonKey != null) {
-        Object keyValue = jsonKey.getValue(parentItem);
-        if (keyValue == null) {
-          throw new IOException(String.format("Null value for json-key for definition '%s'",
-              jsonKey.getContainingDefinition().toCoordinates()));
-        }
-
-        // the field will be the JSON key value
-        String key = jsonKey.getJavaTypeAdapter().asString(keyValue);
-        writer.writeFieldName(key);
+    if (jsonKey != null) {
+      // next the value will be a start object
+      generator.writeEndObject();
+    }
+    generator.writeEndObject();
+  }
 
-        // next the value will be a start object
-        writer.writeStartObject();
+  private <T extends IFeatureComplexItemValueHandler & IBoundInstanceModelGroupedNamed> void writeGroupedModelObject(
+      @NonNull T handler,
+      @NonNull IBoundObject parent,
+      @NonNull ObjectWriter<T> propertyWriter) throws IOException {
+    generator.writeStartObject();
+
+    IBoundInstanceModelChoiceGroup choiceGroup = handler.getParentContainer();
+    IBoundInstanceFlag jsonKey = choiceGroup.getItemJsonKey(parent);
+    if (jsonKey != null) {
+      Object keyValue = jsonKey.getValue(parent);
+      if (keyValue == null) {
+        throw new IOException(String.format("Null value for json-key for definition '%s'",
+            jsonKey.getContainingDefinition().toCoordinates()));
       }
 
-      propertyWriter.accept(parentItem, handler);
+      // the field will be the JSON key value
+      String key = jsonKey.getJavaTypeAdapter().asString(keyValue);
+      generator.writeFieldName(key);
 
-      if (jsonKey != null) {
-        // next the value will be a start object
-        writer.writeEndObject();
-      }
-      writer.writeEndObject();
+      // next the value will be a start object
+      generator.writeStartObject();
     }
 
-    private <T extends IFeatureComplexItemValueHandler & IBoundInstanceModelGroupedNamed> void writeGroupedModelObject(
-        @NonNull T handler,
-        @NonNull Object parentItem,
-        @NonNull ObjectWriter<T> propertyWriter) throws IOException {
-      writer.writeStartObject();
+    propertyWriter.accept(parent, handler);
 
-      IBoundInstanceModelChoiceGroup choiceGroup = handler.getParentContainer();
-      IBoundInstanceFlag jsonKey = choiceGroup.getItemJsonKey(parentItem);
-      if (jsonKey != null) {
-        Object keyValue = jsonKey.getValue(parentItem);
-        if (keyValue == null) {
-          throw new IOException(String.format("Null value for json-key for definition '%s'",
-              jsonKey.getContainingDefinition().toCoordinates()));
-        }
-
-        // the field will be the JSON key value
-        String key = jsonKey.getJavaTypeAdapter().asString(keyValue);
-        writer.writeFieldName(key);
-
-        // next the value will be a start object
-        writer.writeStartObject();
-      }
-
-      propertyWriter.accept(parentItem, handler);
-
-      if (jsonKey != null) {
-        // next the value will be a start object
-        writer.writeEndObject();
-      }
-      writer.writeEndObject();
+    if (jsonKey != null) {
+      // next the value will be a start object
+      generator.writeEndObject();
     }
+    generator.writeEndObject();
   }
 
-  private class ModelInstanceWriteHandler
-      extends AbstractModelInstanceWriteHandler {
+  /**
+   * Supports writing items that are {@link IBoundInstanceModel}-based.
+   *
+   * @param <ITEM>
+   *          the Java type of the item
+   */
+  private class ModelInstanceWriteHandler<ITEM>
+      extends AbstractModelInstanceWriteHandler<ITEM> {
     public ModelInstanceWriteHandler(
-        @NonNull IBoundInstanceModel instance) {
+        @NonNull IBoundInstanceModel<ITEM> instance) {
       super(instance);
     }
 
     @Override
-    public void writeList(List<?> items) throws IOException {
-      IBoundInstanceModel instance = getCollectionInfo().getInstance();
+    public void writeList(List<ITEM> items) throws IOException {
+      IBoundInstanceModel<ITEM> instance = getCollectionInfo().getInstance();
 
       boolean writeArray = false;
       if (JsonGroupAsBehavior.LIST.equals(instance.getJsonGroupAsBehavior())
@@ -375,21 +362,21 @@ public void writeList(List<?> items) throws IOException {
               && items.size() > 1) {
         // write array, then items
         writeArray = true;
-        writer.writeStartArray();
+        generator.writeStartArray();
       } // only other option is a singleton value, write item
 
       super.writeList(items);
 
       if (writeArray) {
         // write the end array
-        writer.writeEndArray();
+        generator.writeEndArray();
       }
     }
 
     @Override
-    public void writeItem(Object item) throws IOException {
-      IBoundInstanceModel instance = getInstance();
-      instance.writeItem(item, getItemWriter());
+    public void writeItem(ITEM item) throws IOException {
+      IBoundInstanceModel<ITEM> instance = getInstance();
+      instance.writeItem(item, MetaschemaJsonWriter.this);
     }
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/CommentFilter.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/CommentFilter.java
index 7633f2541..f30126b7f 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/CommentFilter.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/CommentFilter.java
@@ -1,40 +1,40 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.io.xml;
-
-import javax.xml.stream.EventFilter;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.events.XMLEvent;
-
-public class CommentFilter implements EventFilter {
-
-  @Override
-  public boolean accept(XMLEvent event) {
-    return event.getEventType() != XMLStreamConstants.COMMENT;
-  }
-
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.io.xml;
+
+import javax.xml.stream.EventFilter;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.events.XMLEvent;
+
+public class CommentFilter implements EventFilter {
+
+  @Override
+  public boolean accept(XMLEvent event) {
+    return event.getEventType() != XMLStreamConstants.COMMENT;
+  }
+
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlDeserializer.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlDeserializer.java
index 602d11656..7cb7da9e1 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlDeserializer.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlDeserializer.java
@@ -30,6 +30,7 @@
 
 import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.AutoCloser;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.AbstractDeserializer;
@@ -44,13 +45,15 @@
 import java.net.URI;
 
 import javax.xml.stream.EventFilter;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLResolver;
 import javax.xml.stream.XMLStreamException;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-public class DefaultXmlDeserializer<CLASS>
+public class DefaultXmlDeserializer<CLASS extends IBoundObject>
     extends AbstractDeserializer<CLASS> {
   private XMLInputFactory2 xmlInputFactory;
 
@@ -65,13 +68,14 @@ public class DefaultXmlDeserializer<CLASS>
    *          the assembly class binding describing the Java objects this
    *          deserializer parses data into
    */
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public DefaultXmlDeserializer(@NonNull IBoundDefinitionModelAssembly definition) {
     super(definition);
+    this.rootDefinition = definition;
     if (!definition.isRoot()) {
       throw new UnsupportedOperationException(
           String.format("The assembly '%s' is not a root assembly.", definition.getBoundClass().getName()));
     }
-    this.rootDefinition = definition;
   }
 
   /**
@@ -91,27 +95,23 @@ private XMLInputFactory2 getXMLInputFactory() {
         assert xmlInputFactory instanceof WstxInputFactory;
         xmlInputFactory.configureForXmlConformance();
         xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, false);
+        xmlInputFactory.setProperty(XMLInputFactory2.P_PRESERVE_LOCATION, true);
         // xmlInputFactory.configureForSpeed();
 
         if (isFeatureEnabled(DeserializationFeature.DESERIALIZE_XML_ALLOW_ENTITY_RESOLUTION)) {
           xmlInputFactory.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, true);
           xmlInputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, true);
           xmlInputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, true);
-          xmlInputFactory.setProperty(XMLInputFactory.RESOLVER, new XMLResolver() {
-
-            @Override
-            public Object resolveEntity(String publicID, String systemID, String baseURI, String namespace)
-                throws XMLStreamException {
-              URI base = URI.create(baseURI);
-              URI resource = base.resolve(systemID);
-              try {
-                return resource.toURL().openStream();
-              } catch (IOException ex) {
-                throw new XMLStreamException(ex);
-              }
-            }
-
-          });
+          xmlInputFactory.setProperty(XMLInputFactory.RESOLVER,
+              (XMLResolver) (publicID, systemID, baseURI, namespace) -> {
+                URI base = URI.create(baseURI);
+                URI resource = base.resolve(systemID);
+                try {
+                  return resource.toURL().openStream();
+                } catch (IOException ex) {
+                  throw new XMLStreamException(ex);
+                }
+              });
         }
       }
       return ObjectUtils.notNull(xmlInputFactory);
@@ -151,7 +151,7 @@ protected final IDocumentNodeItem deserializeToNodeItemInternal(Reader reader, U
   public final CLASS deserializeToValue(Reader reader, URI documentUri) throws IOException {
     // doesn't auto close the underlying reader
     try (AutoCloser<XMLEventReader2, XMLStreamException> closer = new AutoCloser<>(
-        newXMLEventReader2(documentUri, reader), event -> event.close())) {
+        newXMLEventReader2(documentUri, reader), XMLEventReader::close)) {
       return parseXmlInternal(closer.getResource());
     } catch (XMLStreamException ex) {
       throw new IOException("Unable to create a new XMLEventReader2 instance.", ex);
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlProblemHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlProblemHandler.java
index 7535e164b..b1e87d3bc 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlProblemHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlProblemHandler.java
@@ -26,9 +26,10 @@
 
 package gov.nist.secauto.metaschema.databind.io.xml;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil;
 import gov.nist.secauto.metaschema.databind.io.AbstractProblemHandler;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -62,8 +63,8 @@ public class DefaultXmlProblemHandler
 
   @Override
   public boolean handleUnknownAttribute(
-      IBoundDefinitionModel parentDefinition,
-      Object targetObject,
+      IBoundDefinitionModelComplex parentDefinition,
+      IBoundObject targetObject,
       Attribute attribute,
       IXmlParsingContext parsingContext) {
     QName qname = attribute.getName();
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlSerializer.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlSerializer.java
index 982b15dc0..1db851889 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlSerializer.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/DefaultXmlSerializer.java
@@ -29,6 +29,7 @@
 import com.ctc.wstx.api.WstxOutputProperties;
 import com.ctc.wstx.stax.WstxOutputFactory;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.AbstractSerializer;
 import gov.nist.secauto.metaschema.databind.io.SerializationFeature;
@@ -45,7 +46,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public class DefaultXmlSerializer<CLASS>
+public class DefaultXmlSerializer<CLASS extends IBoundObject>
     extends AbstractSerializer<CLASS> {
   private XMLOutputFactory2 xmlOutputFactory;
 
@@ -114,7 +115,7 @@ protected final XMLStreamWriter2 newXMLStreamWriter(@NonNull Writer writer) thro
   }
 
   @Override
-  public void serialize(CLASS data, Writer writer) throws IOException {
+  public void serialize(IBoundObject data, Writer writer) throws IOException {
     XMLStreamWriter2 streamWriter = newXMLStreamWriter(writer);
     IOException caughtException = null;
     IBoundDefinitionModelAssembly definition = getDefinition();
@@ -125,9 +126,11 @@ public void serialize(CLASS data, Writer writer) throws IOException {
     try {
       if (serializeRoot) {
         streamWriter.writeStartDocument("UTF-8", "1.0");
+        xmlGenerator.writeRoot(definition, data);
+      } else {
+        xmlGenerator.write(definition, data);
       }
 
-      xmlGenerator.write(definition, data);
       streamWriter.flush();
 
       if (serializeRoot) {
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlParsingContext.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlParsingContext.java
index 84cd916df..6da3de43d 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlParsingContext.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlParsingContext.java
@@ -1,84 +1,83 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.io.xml;
-
-import gov.nist.secauto.metaschema.databind.io.IParsingContext;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel;
-
-import org.codehaus.stax2.XMLEventReader2;
-
-import java.io.IOException;
-
-import javax.xml.stream.XMLStreamConstants;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public interface IXmlParsingContext extends IParsingContext<XMLEventReader2, IXmlProblemHandler> {
-
-  // boolean readItems(
-  // @NonNull IBoundInstanceModel instance,
-  // @NonNull Object parentObject) throws IOException, XMLStreamException;
-
-  /**
-   * Parses XML into a bound object based on the provided {@code definition}.
-   * <p>
-   * Parses the {@link XMLStreamConstants#START_DOCUMENT}, any processing
-   * instructions, and the element.
-   *
-   * @param <CLASS>
-   *          the returned object type
-   * @param definition
-   *          the definition describing the element data to read
-   * @return the parsed object
-   * @throws IOException
-   *           if an error occurred while parsing the input
-   */
-  <CLASS> CLASS read(@NonNull IBoundDefinitionModelComplex definition) throws IOException;
-
-  /**
-   * Read the data associated with the {@code instance} and apply it to the
-   * provided {@code parentObject}.
-   *
-   * @param instance
-   *          the instance to parse data for
-   * @param parentObject
-   *          the Java object that data parsed by this method will be stored in
-   * @param parseGrouping
-   *          if {@code true} parse the instance's grouping element or
-   *          {@code false} otherwise
-   * @return {@code true} if the instance was parsed, or {@code false} if the data
-   *         did not contain information for this instance
-   * @throws IOException
-   *           if an error occurred while parsing the input
-   *
-   */
-  boolean readItems(
-      @NonNull IBoundInstanceModel instance,
-      @NonNull Object parentObject,
-      boolean parseGrouping) throws IOException;
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.io.xml;
+
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.databind.io.IParsingContext;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
+import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel;
+
+import org.codehaus.stax2.XMLEventReader2;
+
+import java.io.IOException;
+
+import javax.xml.stream.XMLStreamConstants;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public interface IXmlParsingContext extends IParsingContext<XMLEventReader2, IXmlProblemHandler> {
+
+  /**
+   * Parses XML into a bound object based on the provided {@code definition}.
+   * <p>
+   * Parses the {@link XMLStreamConstants#START_DOCUMENT}, any processing
+   * instructions, and the element.
+   *
+   * @param <CLASS>
+   *          the returned object type
+   * @param definition
+   *          the definition describing the element data to read
+   * @return the parsed object
+   * @throws IOException
+   *           if an error occurred while parsing the input
+   */
+  <CLASS> CLASS read(@NonNull IBoundDefinitionModelComplex definition) throws IOException;
+
+  /**
+   * Read the data associated with the {@code instance} and apply it to the
+   * provided {@code parentObject}.
+   *
+   * @param <T>
+   *          the item Java type
+   * @param instance
+   *          the instance to parse data for
+   * @param parentObject
+   *          the Java object that data parsed by this method will be stored in
+   * @param parseGrouping
+   *          if {@code true} parse the instance's grouping element or
+   *          {@code false} otherwise
+   * @return {@code true} if the instance was parsed, or {@code false} if the data
+   *         did not contain information for this instance
+   * @throws IOException
+   *           if an error occurred while parsing the input
+   *
+   */
+  <T> boolean readItems(
+      @NonNull IBoundInstanceModel<T> instance,
+      @NonNull IBoundObject parentObject,
+      boolean parseGrouping) throws IOException;
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlProblemHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlProblemHandler.java
index a6120ce45..4b7de4af0 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlProblemHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlProblemHandler.java
@@ -1,140 +1,141 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.io.xml;
-
-import gov.nist.secauto.metaschema.databind.io.IProblemHandler;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import javax.xml.stream.events.Attribute;
-import javax.xml.stream.events.StartElement;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public interface IXmlProblemHandler extends IProblemHandler {
-  /**
-   * Callback used to handle an attribute that is unknown to the model being
-   * parsed.
-   *
-   * @param parentDefinition
-   *          the bound class currently describing the data being parsed
-   * @param targetObject
-   *          the Java object for the {@code parentDefinition}
-   * @param attribute
-   *          the unknown attribute
-   * @param parsingContext
-   *          the XML parsing context used for parsing
-   * @return {@code true} if the attribute was handled by this method, or
-   *         {@code false} otherwise
-   * @throws IOException
-   *           if an error occurred while handling the unrecognized data
-   */
-  default boolean handleUnknownAttribute(
-      @NonNull IBoundDefinitionModel parentDefinition,
-      @NonNull Object targetObject,
-      @NonNull Attribute attribute,
-      @NonNull IXmlParsingContext parsingContext) throws IOException {
-    return false;
-  }
-
-  /**
-   * Callback used to handle an element that is unknown to the model being parsed.
-   *
-   * @param parentDefinition
-   *          the bound assembly class on which the missing instances are found
-   * @param targetObject
-   *          the Java object for the {@code parentDefinition}
-   * @param start
-   *          the parsed XML start element
-   * @param parsingContext
-   *          the XML parsing context used for parsing
-   * @return {@code true} if the element was handled by this method, or
-   *         {@code false} otherwise
-   * @throws IOException
-   *           if an error occurred while handling the unrecognized data
-   */
-  default boolean handleUnknownElement(
-      @NonNull IBoundDefinitionModelAssembly parentDefinition,
-      @NonNull Object targetObject,
-      @NonNull StartElement start,
-      @NonNull IXmlParsingContext parsingContext) throws IOException {
-    return false;
-  }
-
-  /**
-   * A callback used to handle bound flag instances for which no data was found
-   * when the content was parsed.
-   * <p>
-   * This can be used to supply default or prescribed values based on application
-   * logic.
-   *
-   * @param parentDefinition
-   *          the bound assembly class on which the missing instances are found
-   * @param targetObject
-   *          the Java object for the {@code parentDefinition}
-   * @param unhandledInstances
-   *          the set of instances that had no data to parse
-   * @throws IOException
-   *           if an error occurred while handling the missing instances
-   */
-  default void handleMissingFlagInstances(
-      @NonNull IBoundDefinitionModel parentDefinition,
-      @NonNull Object targetObject,
-      @NonNull Collection<IBoundInstanceFlag> unhandledInstances)
-      throws IOException {
-    handleMissingInstances(parentDefinition, targetObject, unhandledInstances);
-  }
-
-  /**
-   * A callback used to handle bound model instances for which no data was found
-   * when the content was parsed.
-   * <p>
-   * This can be used to supply default or prescribed values based on application
-   * logic.
-   *
-   * @param parentDefinition
-   *          the bound assembly class on which the missing instances are found
-   * @param targetObject
-   *          the Java object for the {@code parentDefinition}
-   * @param unhandledInstances
-   *          the set of instances that had no data to parse
-   * @throws IOException
-   *           if an error occurred while handling the missing instances
-   */
-  default void handleMissingModelInstances(
-      @NonNull IBoundDefinitionModelAssembly parentDefinition,
-      @NonNull Object targetObject,
-      @NonNull Collection<? extends IBoundInstanceModel> unhandledInstances)
-      throws IOException {
-    handleMissingInstances(parentDefinition, targetObject, unhandledInstances);
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.io.xml;
+
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.databind.io.IProblemHandler;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
+import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
+import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import javax.xml.stream.events.Attribute;
+import javax.xml.stream.events.StartElement;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public interface IXmlProblemHandler extends IProblemHandler {
+  /**
+   * Callback used to handle an attribute that is unknown to the model being
+   * parsed.
+   *
+   * @param parentDefinition
+   *          the bound class currently describing the data being parsed
+   * @param targetObject
+   *          the Java object for the {@code parentDefinition}
+   * @param attribute
+   *          the unknown attribute
+   * @param parsingContext
+   *          the XML parsing context used for parsing
+   * @return {@code true} if the attribute was handled by this method, or
+   *         {@code false} otherwise
+   * @throws IOException
+   *           if an error occurred while handling the unrecognized data
+   */
+  default boolean handleUnknownAttribute(
+      @NonNull IBoundDefinitionModelComplex parentDefinition,
+      @NonNull IBoundObject targetObject,
+      @NonNull Attribute attribute,
+      @NonNull IXmlParsingContext parsingContext) throws IOException {
+    return false;
+  }
+
+  /**
+   * Callback used to handle an element that is unknown to the model being parsed.
+   *
+   * @param parentDefinition
+   *          the bound assembly class on which the missing instances are found
+   * @param targetObject
+   *          the Java object for the {@code parentDefinition}
+   * @param start
+   *          the parsed XML start element
+   * @param parsingContext
+   *          the XML parsing context used for parsing
+   * @return {@code true} if the element was handled by this method, or
+   *         {@code false} otherwise
+   * @throws IOException
+   *           if an error occurred while handling the unrecognized data
+   */
+  default boolean handleUnknownElement(
+      @NonNull IBoundDefinitionModelAssembly parentDefinition,
+      @NonNull IBoundObject targetObject,
+      @NonNull StartElement start,
+      @NonNull IXmlParsingContext parsingContext) throws IOException {
+    return false;
+  }
+
+  /**
+   * A callback used to handle bound flag instances for which no data was found
+   * when the content was parsed.
+   * <p>
+   * This can be used to supply default or prescribed values based on application
+   * logic.
+   *
+   * @param parentDefinition
+   *          the bound assembly class on which the missing instances are found
+   * @param targetObject
+   *          the Java object for the {@code parentDefinition}
+   * @param unhandledInstances
+   *          the set of instances that had no data to parse
+   * @throws IOException
+   *           if an error occurred while handling the missing instances
+   */
+  default void handleMissingFlagInstances(
+      @NonNull IBoundDefinitionModelComplex parentDefinition,
+      @NonNull IBoundObject targetObject,
+      @NonNull Collection<IBoundInstanceFlag> unhandledInstances)
+      throws IOException {
+    handleMissingInstances(parentDefinition, targetObject, unhandledInstances);
+  }
+
+  /**
+   * A callback used to handle bound model instances for which no data was found
+   * when the content was parsed.
+   * <p>
+   * This can be used to supply default or prescribed values based on application
+   * logic.
+   *
+   * @param parentDefinition
+   *          the bound assembly class on which the missing instances are found
+   * @param targetObject
+   *          the Java object for the {@code parentDefinition}
+   * @param unhandledInstances
+   *          the set of instances that had no data to parse
+   * @throws IOException
+   *           if an error occurred while handling the missing instances
+   */
+  default void handleMissingModelInstances(
+      @NonNull IBoundDefinitionModelAssembly parentDefinition,
+      @NonNull IBoundObject targetObject,
+      @NonNull Collection<? extends IBoundInstanceModel<?>> unhandledInstances)
+      throws IOException {
+    handleMissingInstances(parentDefinition, targetObject, unhandledInstances);
+  }
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlWritingContext.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlWritingContext.java
index 6220c06dc..8a9eb6ec5 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlWritingContext.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/IXmlWritingContext.java
@@ -26,8 +26,9 @@
 
 package gov.nist.secauto.metaschema.databind.io.xml;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.databind.io.IWritingContext;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 
 import org.codehaus.stax2.XMLStreamWriter2;
 
@@ -36,39 +37,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface IXmlWritingContext extends IWritingContext<XMLStreamWriter2> {
-  /**
-   * Write the data described by the provided {@code targetDefinition} as an XML
-   * element.
-   *
-   * @param definition
-   *          the bound Module definition describing the structure of the XML data
-   *          to write
-   * @param targetObject
-   *          the Java object data to write
-   * @throws IOException
-   *           if an error occurred while writing the XML
-   */
-  // * @param parentName
-  // * the qualified name of the XML element to write
-  void write(
-      @NonNull IBoundDefinitionModelComplex definition,
-      @NonNull Object targetObject) throws IOException;
-  //
-  // /**
-  // * Write the data described by the provided {@code targetDefinition} as an XML
-  // * element.
-  // *
-  // * @param targetInstance
-  // * the model instance that describes the syntax of the data to write
-  // * @param targetObject
-  // * the Java object data to write
-  // * @param parentName
-  // * the qualified name of the XML element to write
-  // * @throws IOException
-  // * if an error occurred while writing the XML
-  // */
-  // void writeInstanceValue(
-  // @NonNull IBoundInstanceModel targetInstance,
-  // @NonNull Object targetObject,
-  // @NonNull QName parentName) throws IOException;
+  void writeRoot(
+      @NonNull IBoundDefinitionModelAssembly definition,
+      @NonNull IBoundObject item) throws IOException;
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlReader.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlReader.java
index 9aa5d5468..ac82d27d5 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlReader.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlReader.java
@@ -26,11 +26,12 @@
 
 package gov.nist.secauto.metaschema.databind.io.xml;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex;
@@ -64,6 +65,7 @@
 import java.util.stream.Collectors;
 
 import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.Attribute;
@@ -92,9 +94,9 @@ public MetaschemaXmlReader(
     this(reader, new DefaultXmlProblemHandler());
   }
 
-  public Object readItem(
-      @NonNull Object item,
-      @NonNull IBoundInstance instance,
+  public <ITEM> ITEM readItem(
+      @NonNull IBoundObject item,
+      @NonNull IBoundInstance<ITEM> instance,
       @NonNull StartElement start) throws IOException {
     return instance.readItem(item, new ItemReadHandler(start));
   }
@@ -182,8 +184,8 @@ public <CLASS> CLASS read(@NonNull IBoundDefinitionModelComplex definition) thro
    *           if an error occurred while parsing XML events
    */
   protected void readFlagInstances(
-      @NonNull IBoundDefinitionModel targetDefinition,
-      @NonNull Object targetObject,
+      @NonNull IBoundDefinitionModelComplex targetDefinition,
+      @NonNull IBoundObject targetObject,
       @NonNull StartElement start) throws IOException, XMLStreamException {
 
     Map<QName, IBoundInstanceFlag> flagInstanceMap = targetDefinition.getFlagInstances().stream()
@@ -232,11 +234,11 @@ protected void readFlagInstances(
    */
   protected void readModelInstances(
       @NonNull IBoundDefinitionModelAssembly targetDefinition,
-      @NonNull Object targetObject)
+      @NonNull IBoundObject targetObject)
       throws IOException {
-    Collection<? extends IBoundInstanceModel> instances = targetDefinition.getModelInstances();
-    Set<IBoundInstanceModel> unhandledProperties = new HashSet<>();
-    for (IBoundInstanceModel modelInstance : instances) {
+    Collection<? extends IBoundInstanceModel<?>> instances = targetDefinition.getModelInstances();
+    Set<IBoundInstanceModel<?>> unhandledProperties = new HashSet<>();
+    for (IBoundInstanceModel<?> modelInstance : instances) {
       assert modelInstance != null;
       if (!readItems(modelInstance, targetObject, true)) {
         unhandledProperties.add(modelInstance);
@@ -273,7 +275,7 @@ protected void readModelInstances(
    */
   @SuppressWarnings("PMD.OnlyOneReturn")
   protected boolean isNextInstance(
-      @NonNull IBoundInstanceModel targetInstance)
+      @NonNull IBoundInstanceModel<?> targetInstance)
       throws XMLStreamException {
 
     XmlEventUtil.skipWhitespace(reader);
@@ -303,9 +305,9 @@ protected boolean isNextInstance(
    *           if an error occurred while parsing the input
    */
   @Override
-  public boolean readItems(
-      @NonNull IBoundInstanceModel instance,
-      @NonNull Object parentObject,
+  public <T> boolean readItems(
+      @NonNull IBoundInstanceModel<T> instance,
+      @NonNull IBoundObject parentObject,
       boolean parseGrouping)
       throws IOException {
     try {
@@ -319,9 +321,9 @@ public boolean readItems(
           XmlEventUtil.requireStartElement(reader, groupQName);
         }
 
-        IModelInstanceCollectionInfo collectionInfo = instance.getCollectionInfo();
+        IModelInstanceCollectionInfo<T> collectionInfo = instance.getCollectionInfo();
 
-        ModelInstanceReadHandler handler = new ModelInstanceReadHandler(instance, parentObject);
+        ModelInstanceReadHandler<T> handler = new ModelInstanceReadHandler<>(instance, parentObject);
 
         // let the property info decide how to parse the value
         Object value = collectionInfo.readItems(handler);
@@ -341,23 +343,23 @@ public boolean readItems(
     }
   }
 
-  private final class ModelInstanceReadHandler
-      extends AbstractModelInstanceReadHandler {
+  private final class ModelInstanceReadHandler<ITEM>
+      extends AbstractModelInstanceReadHandler<ITEM> {
 
     private ModelInstanceReadHandler(
-        @NonNull IBoundInstanceModel instance,
-        @NonNull Object parentObject) {
+        @NonNull IBoundInstanceModel<ITEM> instance,
+        @NonNull IBoundObject parentObject) {
       super(instance, parentObject);
     }
 
     @Override
-    public List<?> readList() throws IOException {
+    public List<ITEM> readList() throws IOException {
       return ObjectUtils.notNull(readCollection());
     }
 
     @Override
-    public Map<String, ?> readMap() throws IOException {
-      IBoundInstanceModel instance = getCollectionInfo().getInstance();
+    public Map<String, ITEM> readMap() throws IOException {
+      IBoundInstanceModel<?> instance = getCollectionInfo().getInstance();
 
       return ObjectUtils.notNull(readCollection().stream()
           .collect(Collectors.toMap(
@@ -374,19 +376,19 @@ public List<?> readList() throws IOException {
     }
 
     @NonNull
-    private List<Object> readCollection() throws IOException {
-      List<Object> retval = new LinkedList<>();
+    private List<ITEM> readCollection() throws IOException {
+      List<ITEM> retval = new LinkedList<>();
       try {
         // consume extra whitespace between elements
         XmlEventUtil.skipWhitespace(reader);
 
-        IBoundInstanceModel instance = getCollectionInfo().getInstance();
+        IBoundInstanceModel<?> instance = getCollectionInfo().getInstance();
         XMLEvent event;
         while ((event = reader.peek()).isStartElement()
             && instance.canHandleXmlQName(ObjectUtils.notNull(event.asStartElement().getName()))) {
 
           // Consume the start element
-          Object value = readItem();
+          ITEM value = readItem();
           retval.add(value);
 
           // consume extra whitespace between elements
@@ -399,7 +401,7 @@ private List<Object> readCollection() throws IOException {
     }
 
     @Override
-    public Object readItem() throws IOException {
+    public ITEM readItem() throws IOException {
       try {
         return getCollectionInfo().getInstance().readItem(
             getParentObject(),
@@ -429,18 +431,20 @@ private StartElement getStartElement() {
     }
 
     @NonNull
-    private <DEF extends IBoundDefinitionModelComplex> Object readDefinitionElement(
+    private <DEF extends IBoundDefinitionModelComplex> IBoundObject readDefinitionElement(
         @NonNull DEF definition,
         @NonNull StartElement start,
         @NonNull QName expectedQName,
-        @Nullable Object parent,
-        @NonNull DefinitionBodyHandler<DEF> bodyHandler) throws IOException {
+        @Nullable IBoundObject parent,
+        @NonNull DefinitionBodyHandler<DEF, IBoundObject> bodyHandler) throws IOException {
       try {
         // consume the start element
         XmlEventUtil.requireStartElement(reader, expectedQName);
 
+        Location location = start.getLocation();
+
         // construct the item
-        Object item = definition.newInstance();
+        IBoundObject item = definition.newInstance(location == null ? null : () -> new MetaschemaData(location));
 
         // call pre-parse initialization hook
         definition.callBeforeDeserialize(item, parent);
@@ -466,14 +470,14 @@ private <DEF extends IBoundDefinitionModelComplex> Object readDefinitionElement(
 
     @Override
     public Object readItemFlag(
-        Object parent,
+        IBoundObject parent,
         IBoundInstanceFlag flag) throws IOException {
       throw new UnsupportedOperationException("handled by readFlagInstances()");
     }
 
     private void handleFieldDefinitionBody(
         @NonNull IBoundDefinitionModelFieldComplex definition,
-        @NonNull Object item) throws IOException {
+        @NonNull IBoundObject item) throws IOException {
       IBoundFieldValue fieldValue = definition.getFieldValue();
 
       // parse the value
@@ -483,14 +487,14 @@ private void handleFieldDefinitionBody(
 
     @Override
     public Object readItemField(
-        Object parent,
+        IBoundObject parent,
         IBoundInstanceModelFieldScalar instance)
         throws IOException {
 
       try {
         QName wrapper = null;
         if (instance.isEffectiveValueWrappedInXml()) {
-          wrapper = new QName(instance.getXmlNamespace(), instance.getEffectiveName());
+          wrapper = instance.getXmlQName();
 
           XmlEventUtil.skipWhitespace(getReader());
           XmlEventUtil.requireStartElement(getReader(), wrapper);
@@ -510,8 +514,8 @@ public Object readItemField(
     }
 
     @Override
-    public Object readItemField(
-        Object parent,
+    public IBoundObject readItemField(
+        IBoundObject parent,
         IBoundInstanceModelFieldComplex instance)
         throws IOException {
       return readDefinitionElement(
@@ -523,7 +527,8 @@ public Object readItemField(
     }
 
     @Override
-    public Object readItemField(Object parent, IBoundInstanceModelGroupedField instance) throws IOException {
+    public IBoundObject readItemField(IBoundObject parent, IBoundInstanceModelGroupedField instance)
+        throws IOException {
       return readDefinitionElement(
           instance.getDefinition(),
           getStartElement(),
@@ -533,8 +538,8 @@ public Object readItemField(Object parent, IBoundInstanceModelGroupedField insta
     }
 
     @Override
-    public Object readItemField(
-        Object parent,
+    public IBoundObject readItemField(
+        IBoundObject parent,
         IBoundDefinitionModelFieldComplex definition) throws IOException {
       return readDefinitionElement(
           definition,
@@ -546,20 +551,20 @@ public Object readItemField(
 
     @Override
     public Object readItemFieldValue(
-        Object parent,
+        IBoundObject parent,
         IBoundFieldValue fieldValue) throws IOException {
       return readScalarItem(fieldValue);
     }
 
     private void handleAssemblyDefinitionBody(
         @NonNull IBoundDefinitionModelAssembly definition,
-        @NonNull Object item) throws IOException {
+        @NonNull IBoundObject item) throws IOException {
       readModelInstances(definition, item);
     }
 
     @Override
-    public Object readItemAssembly(
-        Object parent,
+    public IBoundObject readItemAssembly(
+        IBoundObject parent,
         IBoundInstanceModelAssembly instance) throws IOException {
       return readDefinitionElement(
           instance.getDefinition(),
@@ -570,7 +575,8 @@ public Object readItemAssembly(
     }
 
     @Override
-    public Object readItemAssembly(Object parent, IBoundInstanceModelGroupedAssembly instance) throws IOException {
+    public IBoundObject readItemAssembly(IBoundObject parent, IBoundInstanceModelGroupedAssembly instance)
+        throws IOException {
       return readDefinitionElement(
           instance.getDefinition(),
           getStartElement(),
@@ -580,8 +586,8 @@ public Object readItemAssembly(Object parent, IBoundInstanceModelGroupedAssembly
     }
 
     @Override
-    public Object readItemAssembly(
-        Object parent,
+    public IBoundObject readItemAssembly(
+        IBoundObject parent,
         IBoundDefinitionModelAssembly definition) throws IOException {
       return readDefinitionElement(
           definition,
@@ -598,7 +604,8 @@ private Object readScalarItem(@NonNull IFeatureScalarItemValueHandler handler)
     }
 
     @Override
-    public Object readChoiceGroupItem(Object parent, IBoundInstanceModelChoiceGroup instance) throws IOException {
+    public IBoundObject readChoiceGroupItem(IBoundObject parent, IBoundInstanceModelChoiceGroup instance)
+        throws IOException {
       try {
         XMLEventReader2 eventReader = getReader();
         // consume extra whitespace between elements
@@ -615,10 +622,43 @@ public Object readChoiceGroupItem(Object parent, IBoundInstanceModelChoiceGroup
     }
   }
 
+  private static class MetaschemaData implements IMetaschemaData {
+    private final int line;
+    private final int column;
+    private final long charOffset;
+
+    public MetaschemaData(@NonNull Location location) {
+      this.line = location.getLineNumber();
+      this.column = location.getColumnNumber();
+      this.charOffset = location.getCharacterOffset();
+    }
+
+    @Override
+    public int getLine() {
+      return line;
+    }
+
+    @Override
+    public int getColumn() {
+      return column;
+    }
+
+    @Override
+    public long getCharOffset() {
+      return charOffset;
+    }
+
+    @Override
+    public long getByteOffset() {
+      return -1;
+    }
+  }
+
   @FunctionalInterface
-  private interface DefinitionBodyHandler<DEF extends IBoundDefinitionModelComplex> {
+  private interface DefinitionBodyHandler<DEF extends IBoundDefinitionModelComplex, ITEM> {
     void accept(
         @NonNull DEF definition,
-        @NonNull Object item) throws IOException;
+        @NonNull ITEM item) throws IOException;
   }
+
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlWriter.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlWriter.java
index 1ca2f3ca9..79ad75850 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlWriter.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/xml/MetaschemaXmlWriter.java
@@ -26,6 +26,8 @@
 
 package gov.nist.secauto.metaschema.databind.io.xml;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.json.DefaultJsonProblemHandler;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
@@ -78,120 +80,87 @@ public XMLStreamWriter2 getWriter() {
     return writer;
   }
 
+  // =====================================
+  // Entry point for top-level-definitions
+  // =====================================
+
   @Override
   public void write(
       @NonNull IBoundDefinitionModelComplex definition,
-      @NonNull Object item) throws IOException {
+      @NonNull IBoundObject item) throws IOException {
 
     QName qname = definition.getXmlQName();
 
-    definition.writeItem(item, new InstanceWriter(qname));
+    definition.writeItem(item, new ItemWriter(qname));
+  }
+
+  @Override
+  public void writeRoot(
+      @NonNull IBoundDefinitionModelAssembly definition,
+      @NonNull IBoundObject item) throws IOException {
+    definition.writeItem(item, new ItemWriter(ObjectUtils.requireNonNull(definition.getRootXmlQName())));
+  }
+
+  // ================
+  // Instance writers
+  // ================
+
+  private <T> void writeModelInstance(
+      @NonNull IBoundInstanceModel<T> instance,
+      @NonNull Object parentItem,
+      @NonNull ItemWriter itemWriter) throws IOException {
+    Object value = instance.getValue(parentItem);
+    if (value == null) {
+      return;
+    }
+
+    // this if is not strictly needed, since isEmpty will return false on a null
+    // value
+    // checking null here potentially avoids the expensive operation of
+    // instantiating
+    IModelInstanceCollectionInfo<T> collectionInfo = instance.getCollectionInfo();
+    if (!collectionInfo.isEmpty(value)) {
+      QName currentQName = itemWriter.getParentQName();
+      QName groupAsQName = instance.getEffectiveXmlGroupAsQName();
+      try {
+        if (groupAsQName != null) {
+          // write the grouping element
+          writer.writeStartElement(groupAsQName.getNamespaceURI(), groupAsQName.getLocalPart());
+          currentQName = groupAsQName;
+        }
+
+        collectionInfo.writeItems(
+            new ModelInstanceWriteHandler<>(instance, new ItemWriter(currentQName)),
+            value);
+
+        if (groupAsQName != null) {
+          writer.writeEndElement();
+        }
+      } catch (XMLStreamException ex) {
+        throw new IOException(ex);
+      }
+    }
   }
 
-  private static class ModelInstanceWriteHandler
-      extends AbstractModelInstanceWriteHandler {
+  private static class ModelInstanceWriteHandler<ITEM>
+      extends AbstractModelInstanceWriteHandler<ITEM> {
     @NonNull
     private final ItemWriter itemWriter;
 
     public ModelInstanceWriteHandler(
-        @NonNull IBoundInstanceModel instance,
+        @NonNull IBoundInstanceModel<ITEM> instance,
         @NonNull ItemWriter itemWriter) {
       super(instance);
       this.itemWriter = itemWriter;
     }
 
     @Override
-    public void writeItem(Object item) throws IOException {
-      IBoundInstanceModel instance = getInstance();
+    public void writeItem(ITEM item) throws IOException {
+      IBoundInstanceModel<ITEM> instance = getInstance();
       instance.writeItem(item, itemWriter);
     }
   }
 
-  private class InstanceWriter
-      extends AbstractItemWriter {
-
-    public InstanceWriter(@NonNull QName parentQName) {
-      super(parentQName);
-    }
-
-    @Override
-    public void writeItemFlag(Object item, IBoundInstanceFlag instance) throws IOException {
-      instance.writeItem(item, new ItemWriter(getParentQName()));
-    }
-
-    @Override
-    public void writeItemField(Object value, IBoundInstanceModelFieldScalar instance) throws IOException {
-      writeModelInstance(instance, value);
-    }
-
-    @Override
-    public void writeItemField(Object value, IBoundInstanceModelFieldComplex instance) throws IOException {
-      writeModelInstance(instance, value);
-    }
-
-    @Override
-    public void writeItemField(Object item, IBoundInstanceModelGroupedField instance) throws IOException {
-      throw new UnsupportedOperationException("not needed");
-    }
-
-    @Override
-    public void writeItemField(Object item, IBoundDefinitionModelFieldComplex definition) throws IOException {
-      definition.writeItem(item, new ItemWriter(getParentQName()));
-    }
-
-    @Override
-    public void writeItemFieldValue(Object item, IBoundFieldValue fieldValue) throws IOException {
-      throw new UnsupportedOperationException("not needed");
-    }
-
-    @Override
-    public void writeItemAssembly(Object value, IBoundInstanceModelAssembly instance) throws IOException {
-      writeModelInstance(instance, value);
-    }
-
-    @Override
-    public void writeItemAssembly(Object item, IBoundInstanceModelGroupedAssembly instance) throws IOException {
-      throw new UnsupportedOperationException("not needed");
-    }
-
-    @Override
-    public void writeItemAssembly(Object item, IBoundDefinitionModelAssembly definition) throws IOException {
-      definition.writeItem(item, new ItemWriter(getParentQName()));
-    }
-
-    @Override
-    public void writeChoiceGroupItem(Object value, IBoundInstanceModelChoiceGroup instance) throws IOException {
-      writeModelInstance(instance, value);
-    }
-
-    private void writeModelInstance(
-        @NonNull IBoundInstanceModel instance,
-        @NonNull Object value) throws IOException {
-      IModelInstanceCollectionInfo collectionInfo = instance.getCollectionInfo();
-      if (!collectionInfo.isEmpty(value)) {
-        QName currentQName = getParentQName();
-        QName groupAsQName = instance.getEffectiveXmlGroupAsQName();
-        try {
-          if (groupAsQName != null) {
-            // write the grouping element
-            writer.writeStartElement(groupAsQName.getNamespaceURI(), groupAsQName.getLocalPart());
-            currentQName = groupAsQName;
-          }
-
-          collectionInfo.writeItems(
-              new ModelInstanceWriteHandler(instance, new ItemWriter(currentQName)),
-              value);
-
-          if (groupAsQName != null) {
-            writer.writeEndElement();
-          }
-        } catch (XMLStreamException ex) {
-          throw new IOException(ex);
-        }
-      }
-    }
-  }
-
   private class ItemWriter
       extends AbstractItemWriter {
 
@@ -199,21 +168,21 @@ public ItemWriter(@NonNull QName parentQName) {
       super(parentQName);
     }
 
-    private <T extends IBoundInstanceModelNamed & IFeatureComplexItemValueHandler> void writeFlags(
-        @NonNull Object parentItem,
+    private <T extends IBoundInstanceModelNamed<IBoundObject> & IFeatureComplexItemValueHandler> void writeFlags(
+        @NonNull IBoundObject parentItem,
         @NonNull T instance) throws IOException {
       writeFlags(parentItem, instance.getDefinition());
     }
 
     private <T extends IBoundInstanceModelGroupedNamed & IFeatureComplexItemValueHandler> void writeFlags(
-        @NonNull Object parentItem,
+        @NonNull IBoundObject parentItem,
         @NonNull T instance) throws IOException {
       writeFlags(parentItem, instance.getDefinition());
     }
 
     private void writeFlags(
-        @NonNull Object parentItem,
-        @NonNull IBoundDefinitionModel definition) throws IOException {
+        @NonNull IBoundObject parentItem,
+        @NonNull IBoundDefinitionModel<?> definition) throws IOException {
       for (IBoundInstanceFlag flag : definition.getFlagInstances()) {
         assert flag != null;
 
@@ -225,51 +194,47 @@ private void writeFlags(
     }
 
     private <T extends IBoundInstanceModelAssembly & IFeatureComplexItemValueHandler> void writeAssemblyModel(
-        @NonNull Object parentItem,
+        @NonNull IBoundObject parentItem,
         @NonNull T instance) throws IOException {
       writeAssemblyModel(parentItem, instance.getDefinition());
     }
 
     private <T extends IBoundInstanceModelGroupedAssembly & IFeatureComplexItemValueHandler> void writeAssemblyModel(
-        @NonNull Object parentItem,
+        @NonNull IBoundObject parentItem,
         @NonNull T instance) throws IOException {
       writeAssemblyModel(parentItem, instance.getDefinition());
     }
 
     private void writeAssemblyModel(
-        @NonNull Object parentItem,
+        @NonNull IBoundObject parentItem,
         @NonNull IBoundDefinitionModelAssembly definition) throws IOException {
-      for (IBoundInstanceModel modelInstance : definition.getModelInstances()) {
+      for (IBoundInstanceModel<?> modelInstance : definition.getModelInstances()) {
         assert modelInstance != null;
-
-        Object value = modelInstance.getValue(parentItem);
-        if (value != null) {
-          modelInstance.writeItem(value, new InstanceWriter(getParentQName())); // NOPMD needed
-        }
+        writeModelInstance(modelInstance, parentItem, this);
       }
     }
 
     private void writeFieldValue(
-        @NonNull Object parentItem,
+        @NonNull IBoundObject parentItem,
         @NonNull IBoundInstanceModelFieldComplex instance) throws IOException {
       writeFieldValue(parentItem, instance.getDefinition());
     }
 
     private void writeFieldValue(
-        @NonNull Object parentItem,
+        @NonNull IBoundObject parentItem,
         @NonNull IBoundInstanceModelGroupedField instance) throws IOException {
       writeFieldValue(parentItem, instance.getDefinition());
     }
 
     private void writeFieldValue(
-        @NonNull Object parentItem,
+        @NonNull IBoundObject parentItem,
         @NonNull IBoundDefinitionModelFieldComplex definition) throws IOException {
       definition.getFieldValue().writeItem(parentItem, this);
     }
 
-    private <T extends IFeatureComplexItemValueHandler & IBoundInstanceModelNamed> void writeModelObject(
+    private <T extends IFeatureComplexItemValueHandler & IBoundInstanceModelNamed<IBoundObject>> void writeModelObject(
         @NonNull T instance,
-        @NonNull Object parentItem,
+        @NonNull IBoundObject parentItem,
         @NonNull ObjectWriter<T> propertyWriter) throws IOException {
       try {
         QName wrapperQName = instance.getXmlQName();
@@ -285,7 +250,7 @@ private <T extends IFeatureComplexItemValueHandler & IBoundInstanceModelNamed> v
 
     private <T extends IFeatureComplexItemValueHandler & IBoundInstanceModelGroupedNamed> void writeGroupedModelObject(
         @NonNull T instance,
-        @NonNull Object parentItem,
+        @NonNull IBoundObject parentItem,
         @NonNull ObjectWriter<T> propertyWriter) throws IOException {
       try {
         QName wrapperQName = instance.getXmlQName();
@@ -301,7 +266,7 @@ private <T extends IFeatureComplexItemValueHandler & IBoundInstanceModelGroupedN
 
     private <T extends IFeatureComplexItemValueHandler & IBoundDefinitionModelComplex> void writeDefinitionObject(
         @NonNull T instance,
-        @NonNull Object parentItem,
+        @NonNull IBoundObject parentItem,
         @NonNull ObjectWriter<T> propertyWriter) throws IOException {
 
       try {
@@ -354,7 +319,7 @@ public void writeItemField(Object item, IBoundInstanceModelFieldScalar instance)
     }
 
     @Override
-    public void writeItemField(Object item, IBoundInstanceModelFieldComplex instance) throws IOException {
+    public void writeItemField(IBoundObject item, IBoundInstanceModelFieldComplex instance) throws IOException {
       ItemWriter itemWriter = new ItemWriter(instance.getXmlQName());
       writeModelObject(
           instance,
@@ -364,7 +329,7 @@ public void writeItemField(Object item, IBoundInstanceModelFieldComplex instance
     }
 
     @Override
-    public void writeItemField(Object item, IBoundInstanceModelGroupedField instance) throws IOException {
+    public void writeItemField(IBoundObject item, IBoundInstanceModelGroupedField instance) throws IOException {
       ItemWriter itemWriter = new ItemWriter(instance.getXmlQName());
       writeGroupedModelObject(
           instance,
@@ -374,7 +339,7 @@ public void writeItemField(Object item, IBoundInstanceModelGroupedField instance
     }
 
     @Override
-    public void writeItemField(Object item, IBoundDefinitionModelFieldComplex definition) throws IOException {
+    public void writeItemField(IBoundObject item, IBoundDefinitionModelFieldComplex definition) throws IOException {
       ItemWriter itemWriter = new ItemWriter(definition.getXmlQName());
       writeDefinitionObject(
           definition,
@@ -396,7 +361,7 @@ public void writeItemFieldValue(Object parentItem, IBoundFieldValue fieldValue)
     }
 
     @Override
-    public void writeItemAssembly(Object item, IBoundInstanceModelAssembly instance) throws IOException {
+    public void writeItemAssembly(IBoundObject item, IBoundInstanceModelAssembly instance) throws IOException {
       ItemWriter itemWriter = new ItemWriter(instance.getXmlQName());
       writeModelObject(
           instance,
@@ -406,7 +371,7 @@ public void writeItemAssembly(Object item, IBoundInstanceModelAssembly instance)
     }
 
     @Override
-    public void writeItemAssembly(Object item, IBoundInstanceModelGroupedAssembly instance) throws IOException {
+    public void writeItemAssembly(IBoundObject item, IBoundInstanceModelGroupedAssembly instance) throws IOException {
       ItemWriter itemWriter = new ItemWriter(instance.getXmlQName());
       writeGroupedModelObject(
           instance,
@@ -416,7 +381,7 @@ public void writeItemAssembly(Object item, IBoundInstanceModelGroupedAssembly in
     }
 
     @Override
-    public void writeItemAssembly(Object item, IBoundDefinitionModelAssembly definition) throws IOException {
+    public void writeItemAssembly(IBoundObject item, IBoundDefinitionModelAssembly definition) throws IOException {
       ItemWriter itemWriter = new ItemWriter(definition.getXmlQName());
       writeDefinitionObject(
           definition,
@@ -426,14 +391,14 @@ public void writeItemAssembly(Object item, IBoundDefinitionModelAssembly definit
     }
 
     @Override
-    public void writeChoiceGroupItem(Object item, IBoundInstanceModelChoiceGroup instance) throws IOException {
+    public void writeChoiceGroupItem(IBoundObject item, IBoundInstanceModelChoiceGroup instance) throws IOException {
       IBoundInstanceModelGroupedNamed actualInstance = instance.getItemInstance(item);
       assert actualInstance != null;
       actualInstance.writeItem(item, this);
     }
   }
 
-  private abstract class AbstractItemWriter implements IItemWriteHandler {
+  private abstract static class AbstractItemWriter implements IItemWriteHandler {
     @NonNull
     private final QName parentQName;
 
@@ -442,7 +407,9 @@ protected AbstractItemWriter(@NonNull QName parentQName) {
     }
 
     /**
-     * @return the startElement
+     * Get the qualified name of the item's parent.
+     *
+     * @return the qualified name
      */
     @NonNull
     protected QName getParentQName() {
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlDeserializer.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlDeserializer.java
index 8ecf30929..3fa3e9545 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlDeserializer.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlDeserializer.java
@@ -28,13 +28,14 @@
 
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.databind.io.json.DefaultJsonDeserializer;
 import gov.nist.secauto.metaschema.databind.io.yaml.impl.YamlFactoryFactory;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public class DefaultYamlDeserializer<CLASS>
+public class DefaultYamlDeserializer<CLASS extends IBoundObject>
     extends DefaultJsonDeserializer<CLASS> {
 
   /**
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlSerializer.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlSerializer.java
index c97cc212f..70d290366 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlSerializer.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/io/yaml/DefaultYamlSerializer.java
@@ -28,13 +28,14 @@
 
 import com.fasterxml.jackson.core.JsonFactory;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.databind.io.json.DefaultJsonSerializer;
 import gov.nist.secauto.metaschema.databind.io.yaml.impl.YamlFactoryFactory;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public class DefaultYamlSerializer<CLASS>
+public class DefaultYamlSerializer<CLASS extends IBoundObject>
     extends DefaultJsonSerializer<CLASS> {
 
   /**
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/Model.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/Model.java
index 176f4b6c4..2e6437035 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/Model.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/Model.java
@@ -28,17 +28,15 @@
 
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.ISequence;
+import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
 import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
 import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
 import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
 import gov.nist.secauto.metaschema.core.metapath.item.IItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
-import gov.nist.secauto.metaschema.core.model.IDefinition;
 import gov.nist.secauto.metaschema.core.model.INamedInstance;
-import gov.nist.secauto.metaschema.core.model.MetaschemaModelConstants;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBinding;
 
 import java.util.List;
 
@@ -48,7 +46,7 @@ public final class Model {
   @NonNull
   static final IFunction SIGNATURE = IFunction.builder()
       .name("model")
-      .namespace(MetaschemaModelConstants.METAPATH_FUNCTION_NAMESPACE)
+      .namespace(MetapathConstants.NS_METAPATH_FUNCTIONS_EXTENDED)
       .argument(IArgument.builder()
           .name("node")
           .type(INodeItem.class)
@@ -58,7 +56,7 @@ public final class Model {
       .focusIndependent()
       .contextIndependent()
       .deterministic()
-      .returnOne()
+      .returnZeroOrOne()
       .functionHandler(Model::execute)
       .build();
 
@@ -84,7 +82,7 @@ public static ISequence<?> execute(
     }
 
     // always not null, since the first item is required
-    INodeItem node = FunctionUtils.requireFirstItem(nodeSequence, true);
+    INodeItem node = nodeSequence.getFirstItem(true);
 
     if (!(node instanceof IDefinitionNodeItem)) {
       return ISequence.empty();
@@ -96,15 +94,8 @@ public static ISequence<?> execute(
 
   public static INodeItem getModel(@NonNull IDefinitionNodeItem<?, ?> definitionNodeItem) {
     INamedInstance instance = definitionNodeItem.getInstance();
-    INodeItem retval = null;
-    if (instance instanceof IBinding) {
-      retval = ((IBinding) instance).getBoundNodeItem();
-    } else {
-      IDefinition definition = definitionNodeItem.getDefinition();
-      if (definition instanceof IBinding) {
-        retval = ((IBinding) definition).getBoundNodeItem();
-      }
-    }
-    return retval;
+    return instance != null
+        ? instance.getNodeItem()
+        : definitionNodeItem.getDefinition().getNodeItem();
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModule.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModule.java
index 8929a7856..a48f0adee 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModule.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModule.java
@@ -27,11 +27,13 @@
 package gov.nist.secauto.metaschema.databind.model;
 
 import gov.nist.secauto.metaschema.core.model.AbstractModule;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
-import gov.nist.secauto.metaschema.databind.model.annotations.Module;
+import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule;
 
+import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -43,6 +45,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import nl.talsmasoftware.lazy4j.Lazy;
 
@@ -51,19 +55,19 @@ public abstract class AbstractBoundModule
         IBoundModule,
         IBoundDefinitionModelComplex,
         IBoundDefinitionFlag,
-        IBoundDefinitionModelField,
+        IBoundDefinitionModelField<?>,
         IBoundDefinitionModelAssembly>
     implements IBoundModule {
   @NonNull
   private final IBindingContext bindingContext;
   @NonNull
-  private final Lazy<Map<String, IBoundDefinitionModelAssembly>> assemblyDefinitions;
+  private final Lazy<Map<QName, IBoundDefinitionModelAssembly>> assemblyDefinitions;
   @NonNull
-  private final Lazy<Map<String, IBoundDefinitionModelField>> fieldDefinitions;
+  private final Lazy<Map<QName, IBoundDefinitionModelField<?>>> fieldDefinitions;
 
   /**
    * Create a new Module instance for a given class annotated by the
-   * {@link Module} annotation.
+   * {@link MetaschemaModule} annotation.
    * <p>
    * Will also load any imported Metaschemas.
    *
@@ -79,12 +83,12 @@ public static IBoundModule createInstance(
       @NonNull Class<? extends IBoundModule> clazz,
       @NonNull IBindingContext bindingContext) {
 
-    if (!clazz.isAnnotationPresent(Module.class)) {
+    if (!clazz.isAnnotationPresent(MetaschemaModule.class)) {
       throw new IllegalStateException(String.format("The class '%s' is missing the '%s' annotation",
-          clazz.getCanonicalName(), Module.class.getCanonicalName()));
+          clazz.getCanonicalName(), MetaschemaModule.class.getCanonicalName()));
     }
 
-    Module moduleAnnotation = clazz.getAnnotation(Module.class);
+    MetaschemaModule moduleAnnotation = clazz.getAnnotation(MetaschemaModule.class);
 
     List<IBoundModule> importedModules;
     if (moduleAnnotation.imports().length > 0) {
@@ -140,16 +144,16 @@ protected AbstractBoundModule(
               .requireNonNull(bindingContext.getBoundDefinitionForClass(clazz));
         })
         .collect(Collectors.toUnmodifiableMap(
-            IBoundDefinitionModelAssembly::getName,
+            IBoundDefinitionModelAssembly::getDefinitionQName,
             Function.identity()))));
     this.fieldDefinitions = ObjectUtils.notNull(Lazy.lazy(() -> Arrays.stream(getFieldClasses())
         .map(clazz -> {
           assert clazz != null;
-          return (IBoundDefinitionModelField) ObjectUtils
+          return (IBoundDefinitionModelField<?>) ObjectUtils
               .requireNonNull(bindingContext.getBoundDefinitionForClass(clazz));
         })
         .collect(Collectors.toUnmodifiableMap(
-            IBoundDefinitionModelField::getName,
+            IBoundDefinitionModelField::getDefinitionQName,
             Function.identity()))));
   }
 
@@ -165,16 +169,12 @@ public IBindingContext getBindingContext() {
    *
    * @return the annotations
    */
+  @SuppressWarnings({ "null", "unchecked" })
   @NonNull
-  protected Class<?>[] getAssemblyClasses() {
-    Class<?>[] retval;
-    if (getClass().isAnnotationPresent(Module.class)) {
-      Module moduleAnnotation = getClass().getAnnotation(Module.class);
-      retval = moduleAnnotation.assemblies();
-    } else {
-      retval = new Class<?>[] {};
-    }
-    return retval;
+  protected Class<? extends IBoundObject>[] getAssemblyClasses() {
+    return getClass().isAnnotationPresent(MetaschemaModule.class)
+        ? getClass().getAnnotation(MetaschemaModule.class).assemblies()
+        : (Class<? extends IBoundObject>[]) Array.newInstance(Class.class, 0);
   }
 
   /**
@@ -182,16 +182,12 @@ protected Class<?>[] getAssemblyClasses() {
    *
    * @return the annotations
    */
+  @SuppressWarnings({ "null", "unchecked" })
   @NonNull
-  protected Class<?>[] getFieldClasses() {
-    Class<?>[] retval;
-    if (getClass().isAnnotationPresent(Module.class)) {
-      Module moduleAnnotation = getClass().getAnnotation(Module.class);
-      retval = moduleAnnotation.fields();
-    } else {
-      retval = new Class<?>[] {};
-    }
-    return retval;
+  protected Class<? extends IBoundObject>[] getFieldClasses() {
+    return getClass().isAnnotationPresent(MetaschemaModule.class)
+        ? getClass().getAnnotation(MetaschemaModule.class).fields()
+        : (Class<? extends IBoundObject>[]) Array.newInstance(Class.class, 0);
   }
 
   /**
@@ -199,7 +195,7 @@ protected Class<?>[] getFieldClasses() {
    *
    * @return the mapping
    */
-  protected Map<String, IBoundDefinitionModelAssembly> getAssemblyDefinitionMap() {
+  protected Map<QName, IBoundDefinitionModelAssembly> getAssemblyDefinitionMap() {
     return assemblyDefinitions.get();
   }
 
@@ -210,7 +206,7 @@ public Collection<IBoundDefinitionModelAssembly> getAssemblyDefinitions() {
   }
 
   @Override
-  public IBoundDefinitionModelAssembly getAssemblyDefinitionByName(@NonNull String name) {
+  public IBoundDefinitionModelAssembly getAssemblyDefinitionByName(@NonNull QName name) {
     return getAssemblyDefinitionMap().get(name);
   }
 
@@ -219,18 +215,18 @@ public IBoundDefinitionModelAssembly getAssemblyDefinitionByName(@NonNull String
    *
    * @return the mapping
    */
-  protected Map<String, IBoundDefinitionModelField> getFieldDefinitionMap() {
+  protected Map<QName, IBoundDefinitionModelField<?>> getFieldDefinitionMap() {
     return fieldDefinitions.get();
   }
 
   @SuppressWarnings("null")
   @Override
-  public Collection<IBoundDefinitionModelField> getFieldDefinitions() {
+  public Collection<IBoundDefinitionModelField<?>> getFieldDefinitions() {
     return getFieldDefinitionMap().values();
   }
 
   @Override
-  public IBoundDefinitionModelField getFieldDefinitionByName(@NonNull String name) {
+  public IBoundDefinitionModelField<?> getFieldDefinitionByName(@NonNull QName name) {
     return getFieldDefinitionMap().get(name);
   }
 
@@ -242,7 +238,7 @@ public Collection<IBoundDefinitionFlag> getFlagDefinitions() {
   }
 
   @Override
-  public IBoundDefinitionFlag getFlagDefinitionByName(@NonNull String name) {
+  public IBoundDefinitionFlag getFlagDefinitionByName(@NonNull QName name) {
     // Flags are always inline, so they do not have separate definitions
     return null;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundContainerModelAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundContainerModelAssembly.java
index 8d690442b..edcf1e79b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundContainerModelAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundContainerModelAssembly.java
@@ -31,6 +31,8 @@
 import java.util.Collection;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -41,23 +43,23 @@ public interface IBoundContainerModelAssembly extends IContainerModelAssembly {
 
   @Override
   @NonNull
-  Collection<? extends IBoundInstanceModel> getModelInstances();
+  Collection<? extends IBoundInstanceModel<?>> getModelInstances();
 
   @Override
   @NonNull
-  Collection<? extends IBoundInstanceModelNamed> getNamedModelInstances();
+  Collection<? extends IBoundInstanceModelNamed<?>> getNamedModelInstances();
 
   @Override
   @Nullable
-  IBoundInstanceModelNamed getNamedModelInstanceByName(String name);
+  IBoundInstanceModelNamed<?> getNamedModelInstanceByName(QName name);
 
   @Override
   @NonNull
-  Collection<? extends IBoundInstanceModelField> getFieldInstances();
+  Collection<? extends IBoundInstanceModelField<?>> getFieldInstances();
 
   @Override
   @Nullable
-  IBoundInstanceModelField getFieldInstanceByName(String name);
+  IBoundInstanceModelField<?> getFieldInstanceByName(QName name);
 
   @Override
   @NonNull
@@ -65,7 +67,7 @@ public interface IBoundContainerModelAssembly extends IContainerModelAssembly {
 
   @Override
   @Nullable
-  IBoundInstanceModelAssembly getAssemblyInstanceByName(String name);
+  IBoundInstanceModelAssembly getAssemblyInstanceByName(QName name);
 
   @Override
   IBoundInstanceModelChoiceGroup getChoiceGroupInstanceByName(String name);
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundContainerModelChoiceGroup.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundContainerModelChoiceGroup.java
index e06cee619..c8523e9f1 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundContainerModelChoiceGroup.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundContainerModelChoiceGroup.java
@@ -30,22 +30,23 @@
 
 import java.util.Collection;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
 public interface IBoundContainerModelChoiceGroup extends IContainerModelGrouped {
 
   @Override
-  default Collection<? extends IBoundInstanceModelGroupedNamed> getModelInstances() {
-    return getNamedModelInstances();
-  }
+  @NonNull
+  Collection<? extends IBoundInstanceModelGroupedNamed> getModelInstances();
 
   @Override
   @NonNull
   Collection<? extends IBoundInstanceModelGroupedNamed> getNamedModelInstances();
 
   @Override
-  IBoundInstanceModelGroupedNamed getNamedModelInstanceByName(String name);
+  IBoundInstanceModelGroupedNamed getNamedModelInstanceByName(QName name);
 
   @Override
   @NonNull
@@ -53,7 +54,7 @@ default Collection<? extends IBoundInstanceModelGroupedNamed> getModelInstances(
 
   @Override
   @Nullable
-  IBoundInstanceModelGroupedField getFieldInstanceByName(String name);
+  IBoundInstanceModelGroupedField getFieldInstanceByName(QName name);
 
   @Override
   @NonNull
@@ -61,5 +62,5 @@ default Collection<? extends IBoundInstanceModelGroupedNamed> getModelInstances(
 
   @Override
   @Nullable
-  IBoundInstanceModelGroupedAssembly getAssemblyInstanceByName(String name);
+  IBoundInstanceModelGroupedAssembly getAssemblyInstanceByName(QName name);
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionFlag.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionFlag.java
index 01ffec7ef..7dee56a84 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionFlag.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionFlag.java
@@ -32,6 +32,6 @@
  * Represents a flag definition/instance bound to Java field.
  */
 public interface IBoundDefinitionFlag
-    extends IFlagDefinition, IBoundDefinition {
+    extends IFlagDefinition, IBoundModuleElement<Object> {
   // no additional methods
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModel.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModel.java
index 4ec46346e..53bdd9c9f 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModel.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModel.java
@@ -26,20 +26,31 @@
 
 package gov.nist.secauto.metaschema.databind.model;
 
-import gov.nist.secauto.metaschema.core.model.IModelDefinition;
+import gov.nist.secauto.metaschema.core.model.IFeatureContainerFlag;
+import gov.nist.secauto.metaschema.databind.IBindingContext;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
  * Represents a field or assembly instance bound to Java data.
+ *
+ * @param <ITEM>
+ *          the Java type for associated bound objects
  */
-// REFACTOR: rename to IBoundDefinitionModelNamed
-public interface IBoundDefinitionModel
-    extends IBoundDefinition, IBoundContainerFlag, IModelDefinition {
-  // @NonNull
-  // Class<?> getBoundClass();
+public interface IBoundDefinitionModel<ITEM>
+    extends IBoundModuleElement<ITEM>, IFeatureContainerFlag<IBoundInstanceFlag> {
+  /**
+   * Get the binding context used for the definition.
+   *
+   * @return the binding context
+   */
+  @NonNull
+  IBindingContext getBindingContext();
 
   @Override
-  IBoundInstanceModelNamed getInlineInstance();
+  IBoundInstanceModelNamed<ITEM> getInlineInstance();
 
-  @Override
-  IBoundInstanceFlag getJsonKeyFlagInstance();
+  //
+  // @Override
+  // IBoundInstanceFlag getJsonKeyFlagInstance();
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelAssembly.java
index 93970466e..4aa60ce34 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelAssembly.java
@@ -27,12 +27,14 @@
 package gov.nist.secauto.metaschema.databind.model;
 
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler;
 import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler;
 
 import java.io.IOException;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -50,7 +52,6 @@ public interface IBoundDefinitionModelAssembly
 
   // Assembly Definition Features
   // ============================
-
   @Override
   @NonNull
   default IBoundDefinitionModelAssembly getOwningDefinition() {
@@ -69,15 +70,16 @@ default IBoundInstanceModelAssembly getInlineInstance() {
     // never inline
     return null;
   }
-
-  @Override
-  default QName getXmlQName() {
-    return ObjectUtils.requireNonNull(getRootXmlQName());
-  }
+  //
+  // @Override
+  // @NonNull
+  // default QName getXmlQName() {
+  // return ObjectUtils.requireNonNull(getRootXmlQName());
+  // }
 
   @Override
   @NonNull
-  default Map<String, IBoundProperty> getJsonProperties(@Nullable Predicate<IBoundInstanceFlag> flagFilter) {
+  default Map<String, IBoundProperty<?>> getJsonProperties(@Nullable Predicate<IBoundInstanceFlag> flagFilter) {
     Stream<? extends IBoundInstanceFlag> flagStream = getFlagInstances().stream();
 
     if (flagFilter != null) {
@@ -85,26 +87,20 @@ default Map<String, IBoundProperty> getJsonProperties(@Nullable Predicate<IBound
     }
 
     return ObjectUtils.notNull(Stream.concat(flagStream, getModelInstances().stream())
-        .collect(Collectors.toUnmodifiableMap(
-            (p) -> p.getJsonName(), (p) -> p)));
+        .collect(Collectors.toUnmodifiableMap(IBoundProperty::getJsonName, Function.identity())));
   }
 
   @Override
   @NonNull
-  default Object readItem(@Nullable Object parent, @NonNull IItemReadHandler handler) throws IOException {
+  default IBoundObject readItem(@Nullable IBoundObject parent, @NonNull IItemReadHandler handler) throws IOException {
     return handler.readItemAssembly(parent, this);
   }
 
   @Override
-  default void writeItem(Object item, IItemWriteHandler handler) throws IOException {
+  default void writeItem(IBoundObject item, IItemWriteHandler handler) throws IOException {
     handler.writeItemAssembly(item, this);
   }
 
-  @Override
-  default boolean canHandleJsonPropertyName(@NonNull String name) {
-    return name.equals(getRootJsonName());
-  }
-
   @Override
   default boolean canHandleXmlQName(@NonNull QName qname) {
     return qname.equals(getRootXmlQName());
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelComplex.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelComplex.java
index c599608f0..b5b6c6bc6 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelComplex.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelComplex.java
@@ -26,14 +26,15 @@
 
 package gov.nist.secauto.metaschema.databind.model;
 
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.databind.io.BindingException;
 import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.function.Predicate;
 
-import javax.xml.namespace.QName;
-
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -41,31 +42,80 @@
  * Represents a field or assembly instance bound to Java class.
  */
 public interface IBoundDefinitionModelComplex
-    extends IBoundDefinitionModel, IFeatureComplexItemValueHandler {
-  @Override
+    extends IBoundDefinitionModel<IBoundObject>, IFeatureComplexItemValueHandler {
+
   @NonNull
-  Class<?> getBoundClass();
+  Map<String, IBoundProperty<?>> getJsonProperties(@Nullable Predicate<IBoundInstanceFlag> flagFilter);
+
+  @Override
+  default boolean isInline() {
+    return getBoundClass().getEnclosingClass() != null;
+  }
+
+  @Nullable
+  Method getBeforeDeserializeMethod();
 
   /**
-   * Retrieve the XML namespace for this definition.
+   * Calls the method named "beforeDeserialize" on each class in the object's
+   * hierarchy if the method exists on the class.
+   * <p>
+   * These methods can be used to set the initial state of the target bound object
+   * before data is read and applied during deserialization.
    *
-   * @return the XML namespace or {@code null} if no namespace is defined
+   * @param targetObject
+   *          the data object target to call the method(s) on
+   * @param parentObject
+   *          the object target's parent object, which is used as the method
+   *          argument
+   * @throws BindingException
+   *           if an error occurs while calling the method
    */
-  @NonNull
-  default String getXmlNamespace() {
-    return ObjectUtils.notNull(getContainingModule().getXmlNamespace().toASCIIString());
+  @Override
+  default void callBeforeDeserialize(IBoundObject targetObject, IBoundObject parentObject) throws BindingException {
+    Method beforeDeserializeMethod = getBeforeDeserializeMethod();
+    if (beforeDeserializeMethod != null) {
+      try {
+        beforeDeserializeMethod.invoke(targetObject, parentObject);
+      } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
+        throw new BindingException(ex);
+      }
+    }
   }
 
+  @Nullable
+  Method getAfterDeserializeMethod();
+
   /**
-   * Get the XML qualified name to use in XML.
+   * Calls the method named "afterDeserialize" on each class in the object's
+   * hierarchy if the method exists.
+   * <p>
+   * These methods can be used to modify the state of the target bound object
+   * after data is read and applied during deserialization.
    *
-   * @return the XML qualified name, or {@code null} if there isn't one
+   * @param targetObject
+   *          the data object target to call the method(s) on
+   * @param parentObject
+   *          the object target's parent object, which is used as the method
+   *          argument
+   * @throws BindingException
+   *           if an error occurs while calling the method
    */
-  @NonNull
-  default QName getXmlQName() {
-    return new QName(getXmlNamespace(), getEffectiveName());
+  @Override
+  default void callAfterDeserialize(IBoundObject targetObject, IBoundObject parentObject) throws BindingException {
+    Method afterDeserializeMethod = getAfterDeserializeMethod();
+    if (afterDeserializeMethod != null) {
+      try {
+        afterDeserializeMethod.invoke(targetObject, parentObject);
+      } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
+        throw new BindingException(ex);
+      }
+    }
   }
 
-  @NonNull
-  Map<String, IBoundProperty> getJsonProperties(@Nullable Predicate<IBoundInstanceFlag> flagFilter);
+  // @Override
+  // public String getJsonKeyFlagName() {
+  // // definition items never have a JSON key
+  // return null;
+  // }
+
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelField.java
index 286200e79..fc1eb6235 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelField.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelField.java
@@ -38,12 +38,15 @@
  * <li>"scalar", meaning they have only a scalar field value, or</li>
  * <li>"complex", meaning they allow flags and are bound to a Java class.
  * </ul>
+ *
+ * @param <ITEM>
+ *          the Java type for associated bound objects
  */
-public interface IBoundDefinitionModelField
-    extends IFieldDefinition, IBoundDefinitionModel {
+public interface IBoundDefinitionModelField<ITEM>
+    extends IFieldDefinition, IBoundDefinitionModel<ITEM> {
 
   @Override
-  default IBoundInstanceModelField getInlineInstance() {
+  default IBoundInstanceModelField<ITEM> getInlineInstance() {
     // never inline
     return null;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java
index 5bd17bd3f..b690ab861 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java
@@ -27,6 +27,7 @@
 package gov.nist.secauto.metaschema.databind.model;
 
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler;
 import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler;
@@ -34,6 +35,7 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -49,7 +51,7 @@
  * This definition is considered "complex", since it is bound to a Java class.
  */
 public interface IBoundDefinitionModelFieldComplex
-    extends IBoundDefinitionModelField, IBoundDefinitionModelComplex {
+    extends IBoundDefinitionModelField<IBoundObject>, IBoundDefinitionModelComplex {
 
   // Complex Field Definition Features
   // =================================
@@ -68,7 +70,7 @@ default Object getDefaultValue() {
 
     Object fieldValueDefault = fieldValue.getDefaultValue();
     if (fieldValueDefault != null) {
-      retval = definition.newInstance();
+      retval = definition.newInstance(null);
       fieldValue.setValue(retval, fieldValueDefault);
 
       // since the field value is non-null, populate the flags
@@ -110,13 +112,13 @@ default IDataTypeAdapter<?> getJavaTypeAdapter() {
 
   @Override
   @NonNull
-  default Map<String, IBoundProperty> getJsonProperties(@Nullable Predicate<IBoundInstanceFlag> flagFilter) {
+  default Map<String, IBoundProperty<?>> getJsonProperties(@Nullable Predicate<IBoundInstanceFlag> flagFilter) {
     Predicate<IBoundInstanceFlag> actualFlagFilter = flagFilter;
 
     IBoundFieldValue fieldValue = getFieldValue();
     IBoundInstanceFlag jsonValueKey = getDefinition().getJsonValueKeyFlagInstance();
     if (jsonValueKey != null) {
-      Predicate<IBoundInstanceFlag> jsonValueKeyFilter = (flag) -> !flag.equals(jsonValueKey);
+      Predicate<IBoundInstanceFlag> jsonValueKeyFilter = flag -> !flag.equals(jsonValueKey);
       actualFlagFilter = actualFlagFilter == null ? jsonValueKeyFilter : actualFlagFilter.and(jsonValueKeyFilter);
       // ensure the field value is omitted too!
       fieldValue = null;
@@ -139,32 +141,25 @@ default Map<String, IBoundProperty> getJsonProperties(@Nullable Predicate<IBound
       flagStream = flagInstances.stream();
     }
 
-    Stream<? extends IBoundProperty> resultStream = fieldValue == null
+    Stream<? extends IBoundProperty<?>> resultStream = fieldValue == null
         ? flagStream
         : Stream.concat(flagStream, Stream.of(getFieldValue()));
 
     return ObjectUtils.notNull(resultStream
-        .collect(Collectors.toUnmodifiableMap(
-            (p) -> p.getJsonName(), (p) -> p)));
+        .collect(Collectors.toUnmodifiableMap(IBoundProperty::getJsonName, Function.identity())));
   }
 
   @Override
   @NonNull
-  default Object readItem(Object parent, IItemReadHandler handler) throws IOException {
+  default IBoundObject readItem(IBoundObject parent, IItemReadHandler handler) throws IOException {
     return handler.readItemField(parent, this);
   }
 
   @Override
-  default void writeItem(Object item, IItemWriteHandler handler) throws IOException {
+  default void writeItem(IBoundObject item, IItemWriteHandler handler) throws IOException {
     handler.writeItemField(item, this);
   }
 
-  @Override
-  default boolean canHandleJsonPropertyName(String name) {
-    // not handled, since not root
-    return false;
-  }
-
   @Override
   default boolean canHandleXmlQName(QName qname) {
     // not handled, since not root
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundFieldValue.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundFieldValue.java
index 06f17f442..67e79cf7d 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundFieldValue.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundFieldValue.java
@@ -26,7 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.model;
 
-import gov.nist.secauto.metaschema.core.util.CollectionUtil;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
 import gov.nist.secauto.metaschema.databind.model.info.IFeatureScalarItemValueHandler;
@@ -34,20 +34,13 @@
 import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler;
 
 import java.io.IOException;
-import java.util.Collection;
 
 import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IBoundFieldValue extends IFeatureScalarItemValueHandler, IBoundProperty {
-
-  @Override
-  default IBoundFieldValue getInstance() {
-    return this;
-  }
-
+public interface IBoundFieldValue extends IFeatureScalarItemValueHandler, IBoundProperty<Object> {
   @Override
   @Nullable
   Object getDefaultValue();
@@ -90,22 +83,7 @@ default Object getEffectiveDefaultValue() {
   }
 
   @Override
-  default Object getValue(Object parent) {
-    return IBoundProperty.super.getValue(parent);
-  }
-
-  @Override
-  default void setValue(Object parentObject, Object value) {
-    IBoundProperty.super.setValue(parentObject, value);
-  }
-
-  @Override
-  default Collection<? extends Object> getItemValues(Object value) {
-    return value == null ? CollectionUtil.emptyList() : CollectionUtil.singleton(value);
-  }
-
-  @Override
-  default Object readItem(Object parent, IItemReadHandler handler) throws IOException {
+  default Object readItem(IBoundObject parent, IItemReadHandler handler) throws IOException {
     return handler.readItemFieldValue(ObjectUtils.requireNonNull(parent, "parent"), this);
   }
 
@@ -115,17 +93,11 @@ default void writeItem(Object item, IItemWriteHandler handler) throws IOExceptio
   }
 
   @Override
-  default void deepCopy(@NonNull Object fromInstance, @NonNull Object toInstance) throws BindingException {
+  default void deepCopy(@NonNull IBoundObject fromInstance, @NonNull IBoundObject toInstance) throws BindingException {
     Object value = getValue(fromInstance);
     setValue(toInstance, value);
   }
 
-  @Override
-  default boolean canHandleJsonPropertyName(String name) {
-    // REFACTOR: Is this correct?
-    return name.equals(getJsonValueKeyName());
-  }
-
   @Override
   default boolean canHandleXmlQName(QName qname) {
     // REFACTOR: Is this correct?
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstance.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstance.java
index 91884cce0..7a6622e35 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstance.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstance.java
@@ -26,27 +26,40 @@
 
 package gov.nist.secauto.metaschema.databind.model;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.IInstance;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 /**
  * Represents a Metaschema module instance bound to Java data.
+ *
+ * @param <ITEM>
+ *          the Java type for associated bound objects
  */
-public interface IBoundInstance extends IBoundProperty, IInstance {
+public interface IBoundInstance<ITEM> extends IBoundProperty<ITEM>, IInstance {
   @Override
-  IBoundDefinitionModel getContainingDefinition();
+  IBoundDefinitionModel<IBoundObject> getContainingDefinition();
 
   /**
    * {@inheritDoc}
    * <p>
-   * An instance is contained in the parent definition's module.
+   * Always bound to a field.
    */
   @Override
-  default IBoundModule getContainingModule() {
-    return getContainingDefinition().getContainingModule();
+  @Nullable
+  default Object getValue(@NonNull Object parent) {
+    return IBoundProperty.super.getValue(parent);
   }
 
+  /**
+   * {@inheritDoc}
+   * <p>
+   * Always bound to a field.
+   */
   @Override
-  default Object getValue(Object parent) {
-    return IBoundProperty.super.getValue(parent);
+  default void setValue(@NonNull Object parentObject, @Nullable Object value) {
+    IBoundProperty.super.setValue(parentObject, value);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceFlag.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceFlag.java
index f04701ccf..b3f94c8e2 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceFlag.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceFlag.java
@@ -26,8 +26,9 @@
 
 package gov.nist.secauto.metaschema.databind.model;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
-import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
 import gov.nist.secauto.metaschema.databind.model.impl.InstanceFlagInline;
@@ -37,12 +38,10 @@
 
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.util.Collection;
 
 import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
 /**
  * Represents a flag instance bound to Java data.
@@ -50,7 +49,7 @@
 public interface IBoundInstanceFlag
     extends IFlagInstance, IBoundDefinitionFlag,
     IFeatureScalarItemValueHandler,
-    IFeatureBoundDefinitionInline<IBoundDefinitionFlag, IBoundInstanceFlag> {
+    IBoundInstance<Object>, IFeatureDefinitionInstanceInlined<IBoundDefinitionFlag, IBoundInstanceFlag> {
 
   /**
    * Create a new bound flag instance.
@@ -64,7 +63,7 @@ public interface IBoundInstanceFlag
   @NonNull
   static IBoundInstanceFlag newInstance(
       @NonNull Field field,
-      @NonNull IBoundDefinitionModel containingDefinition) {
+      @NonNull IBoundDefinitionModel<IBoundObject> containingDefinition) {
     return new InstanceFlagInline(field, containingDefinition);
   }
 
@@ -93,20 +92,14 @@ static IBoundInstanceFlag newInstance(
 
   @Override
   @NonNull
-  IBoundDefinitionModel getContainingDefinition();
+  IBoundDefinitionModel<IBoundObject> getContainingDefinition();
 
   @Override
   @NonNull
-  default IBoundDefinitionModel getParentContainer() {
+  default IBoundDefinitionModel<IBoundObject> getParentContainer() {
     return getContainingDefinition();
   }
 
-  @Override
-  @NonNull
-  default IBoundInstanceFlag getInstance() {
-    return this;
-  }
-
   /**
    * {@inheritDoc}
    * <p>
@@ -114,9 +107,7 @@ default IBoundInstanceFlag getInstance() {
    */
   @Override
   @NonNull
-  default IBoundInstanceFlag getDefinition() {
-    return this;
-  }
+  IBoundDefinitionFlag getDefinition();
 
   @Override
   @NonNull
@@ -126,33 +117,7 @@ default IBoundInstanceFlag getInlineInstance() {
   }
 
   @Override
-  default Collection<? extends Object> getItemValues(Object value) {
-    return value == null ? CollectionUtil.emptyList() : CollectionUtil.singleton(value);
-  }
-
-  /**
-   * {@inheritDoc}
-   * <p>
-   * Always bound to a field.
-   */
-  @Override
-  @Nullable
-  default Object getValue(@NonNull Object parent) {
-    return IFeatureBoundDefinitionInline.super.getValue(parent);
-  }
-
-  /**
-   * {@inheritDoc}
-   * <p>
-   * Always bound to a field.
-   */
-  @Override
-  default void setValue(@NonNull Object parentObject, @Nullable Object value) {
-    IFeatureBoundDefinitionInline.super.setValue(parentObject, value);
-  }
-
-  @Override
-  default void deepCopy(@NonNull Object fromInstance, @NonNull Object toInstance) throws BindingException {
+  default void deepCopy(@NonNull IBoundObject fromInstance, @NonNull IBoundObject toInstance) throws BindingException {
     Object value = getValue(fromInstance);
     if (value != null) {
       setValue(toInstance, deepCopyItem(value, toInstance));
@@ -161,7 +126,7 @@ default void deepCopy(@NonNull Object fromInstance, @NonNull Object toInstance)
 
   @Override
   @NonNull
-  default Object readItem(Object parent, @NonNull IItemReadHandler handler) throws IOException {
+  default Object readItem(IBoundObject parent, @NonNull IItemReadHandler handler) throws IOException {
     return handler.readItemFlag(ObjectUtils.requireNonNull(parent, "parent"), this);
   }
 
@@ -170,11 +135,6 @@ default void writeItem(Object item, IItemWriteHandler handler) throws IOExceptio
     handler.writeItemFlag(item, this);
   }
 
-  @Override
-  default boolean canHandleJsonPropertyName(@NonNull String name) {
-    return name.equals(getJsonName());
-  }
-
   @Override
   default boolean canHandleXmlQName(@NonNull QName qname) {
     return qname.equals(getXmlQName());
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModel.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModel.java
index e8a3945b9..b39c24df7 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModel.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModel.java
@@ -42,9 +42,12 @@
 
 /**
  * Represents an assembly or field instance bound to Java data.
+ *
+ * @param <ITEM>
+ *          the Java type for associated bound objects
  */
-public interface IBoundInstanceModel
-    extends IBoundInstance, IModelInstanceAbsolute {
+public interface IBoundInstanceModel<ITEM>
+    extends IBoundInstance<ITEM>, IModelInstanceAbsolute {
   /**
    * Get the collection Java item type for the Java field associated with this
    * instance.
@@ -73,6 +76,39 @@ static Class<?> getItemType(@NonNull Field field) {
     return itemType;
   }
 
+  /**
+   * Get the collection Java item type for the Java field associated with this
+   * instance.
+   *
+   * @param <TYPE>
+   *          the item's expected Java type
+   * @param field
+   *          the Java field for the instance
+   * @param expectedItemType
+   *          the item's expected Java type, which may be a super type of the
+   *          item's type
+   * @return the Java item type
+   */
+  @NonNull
+  static <TYPE> Class<? extends TYPE> getItemType(@NonNull Field field, @NonNull Class<TYPE> expectedItemType) {
+    Type fieldType = field.getGenericType();
+    Class<?> rawType = ObjectUtils.notNull(
+        (Class<?>) (fieldType instanceof ParameterizedType ? ((ParameterizedType) fieldType).getRawType() : fieldType));
+
+    Class<?> itemType;
+    if (Map.class.isAssignableFrom(rawType)) {
+      // this is a Map so the second generic type is the value
+      itemType = ObjectUtils.notNull((Class<?>) ((ParameterizedType) fieldType).getActualTypeArguments()[1]);
+    } else if (List.class.isAssignableFrom(rawType)) {
+      // this is a List so there is only a single generic type
+      itemType = ObjectUtils.notNull((Class<?>) ((ParameterizedType) fieldType).getActualTypeArguments()[0]);
+    } else {
+      // non-collection
+      itemType = rawType;
+    }
+    return ObjectUtils.notNull(itemType.asSubclass(expectedItemType));
+  }
+
   @Override
   @NonNull
   IBoundDefinitionModelAssembly getContainingDefinition();
@@ -102,7 +138,7 @@ default Collection<? extends Object> getItemValues(Object value) {
    * @return the collection Java binding information
    */
   @NonNull
-  IModelInstanceCollectionInfo getCollectionInfo();
+  IModelInstanceCollectionInfo<ITEM> getCollectionInfo();
 
   /**
    * Get the JSON key flag for the provided item.
@@ -113,24 +149,4 @@ default Collection<? extends Object> getItemValues(Object value) {
    */
   @Nullable
   IBoundInstanceFlag getItemJsonKey(@NonNull Object item);
-
-  /**
-   * {@inheritDoc}
-   * <p>
-   * Always bound to a field.
-   */
-  @Override
-  default Object getValue(Object parent) {
-    return IBoundInstance.super.getValue(parent);
-  }
-
-  /**
-   * {@inheritDoc}
-   * <p>
-   * Always bound to a field.
-   */
-  @Override
-  default void setValue(Object parentObject, Object value) {
-    IBoundInstance.super.setValue(parentObject, value);
-  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelAssembly.java
index 4321e0943..fbb2feb07 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelAssembly.java
@@ -27,10 +27,12 @@
 package gov.nist.secauto.metaschema.databind.model;
 
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
 import gov.nist.secauto.metaschema.databind.model.impl.InstanceModelAssemblyComplex;
+import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler;
 import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler;
 import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler;
 
@@ -43,8 +45,7 @@
  * Represents an assembly instance bound to Java field.
  */
 public interface IBoundInstanceModelAssembly
-    extends IBoundInstanceModelNamedComplex, IAssemblyInstanceAbsolute {
-
+    extends IBoundInstanceModelNamed<IBoundObject>, IAssemblyInstanceAbsolute, IFeatureComplexItemValueHandler {
   /**
    * Create a new bound assembly instance.
    *
@@ -58,24 +59,22 @@ public interface IBoundInstanceModelAssembly
   static IBoundInstanceModelAssembly newInstance(
       @NonNull Field field,
       @NonNull IBoundDefinitionModelAssembly containingDefinition) {
-    Class<?> itemType = IBoundInstanceModel.getItemType(field);
+    Class<? extends IBoundObject> itemType = IBoundInstanceModel.getItemType(field, IBoundObject.class);
     IBindingContext bindingContext = containingDefinition.getBindingContext();
-    IBoundDefinitionModel definition = bindingContext.getBoundDefinitionForClass(itemType);
+    IBoundDefinitionModel<?> definition = bindingContext.getBoundDefinitionForClass(itemType);
     if (definition instanceof IBoundDefinitionModelAssembly) {
-      return new InstanceModelAssemblyComplex(field, (IBoundDefinitionModelAssembly) definition, containingDefinition);
+      return InstanceModelAssemblyComplex.newInstance(
+          field,
+          (IBoundDefinitionModelAssembly) definition,
+          containingDefinition);
     }
 
     throw new IllegalStateException(String.format(
-        "The field '%s' on class '%s' is not bound to a Metaschema field",
+        "The field '%s' on class '%s' is not bound to a Metaschema assembly",
         field.toString(),
         field.getDeclaringClass().getName()));
   }
 
-  @Override
-  default IBoundInstanceModelAssembly getInstance() {
-    return this;
-  }
-
   @Override
   @NonNull
   IBoundDefinitionModelAssembly getDefinition();
@@ -90,32 +89,32 @@ default IBoundInstanceModelAssembly getInstance() {
   // }
 
   @Override
-  default Object readItem(Object parent, IItemReadHandler handler) throws IOException {
+  default IBoundObject readItem(IBoundObject parent, IItemReadHandler handler) throws IOException {
     return handler.readItemAssembly(ObjectUtils.requireNonNull(parent, "parent"), this);
   }
 
   @Override
-  default void writeItem(Object item, IItemWriteHandler handler) throws IOException {
+  default void writeItem(IBoundObject item, IItemWriteHandler handler) throws IOException {
     handler.writeItemAssembly(item, this);
   }
 
   @Override
-  default Object deepCopyItem(Object item, Object parentInstance) throws BindingException {
+  default IBoundObject deepCopyItem(IBoundObject item, IBoundObject parentInstance) throws BindingException {
     return getDefinition().deepCopyItem(item, parentInstance);
   }
 
   @Override
-  default Class<?> getBoundClass() {
+  default Class<? extends IBoundObject> getBoundClass() {
     return getDefinition().getBoundClass();
   }
 
   @Override
-  default void callBeforeDeserialize(Object targetObject, Object parentObject) throws BindingException {
+  default void callBeforeDeserialize(IBoundObject targetObject, IBoundObject parentObject) throws BindingException {
     getDefinition().callBeforeDeserialize(targetObject, parentObject);
   }
 
   @Override
-  default void callAfterDeserialize(Object targetObject, Object parentObject) throws BindingException {
+  default void callAfterDeserialize(IBoundObject targetObject, IBoundObject parentObject) throws BindingException {
     getDefinition().callAfterDeserialize(targetObject, parentObject);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java
index 5465937a6..138f46cd6 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.model;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
@@ -45,7 +46,7 @@
  * Represents a choice group instance bound to Java field.
  */
 public interface IBoundInstanceModelChoiceGroup
-    extends IBoundInstanceModel, IBoundContainerModelChoiceGroup, IChoiceGroupInstance {
+    extends IBoundInstanceModel<IBoundObject>, IBoundContainerModelChoiceGroup, IChoiceGroupInstance {
 
   /**
    * Create a new bound choice group instance.
@@ -60,12 +61,7 @@ public interface IBoundInstanceModelChoiceGroup
   static IBoundInstanceModelChoiceGroup newInstance(
       @NonNull Field field,
       @NonNull IBoundDefinitionModelAssembly containingDefinition) {
-    return new InstanceModelChoiceGroup(field, containingDefinition);
-  }
-
-  @Override
-  default IBoundInstanceModelChoiceGroup getInstance() {
-    return this;
+    return InstanceModelChoiceGroup.newInstance(field, containingDefinition);
   }
 
   @Override
@@ -135,24 +131,19 @@ default IBoundInstanceModelGroupedNamed getItemInstance(Object item) {
   }
 
   @Override
-  default Object readItem(Object parent, IItemReadHandler handler) throws IOException {
+  default IBoundObject readItem(IBoundObject parent, IItemReadHandler handler) throws IOException {
     return handler.readChoiceGroupItem(ObjectUtils.requireNonNull(parent, "parent"), this);
   }
 
   @Override
-  default void writeItem(Object item, IItemWriteHandler handler) throws IOException {
+  default void writeItem(IBoundObject item, IItemWriteHandler handler) throws IOException {
     handler.writeChoiceGroupItem(item, this);
   }
 
   @Override
-  default Object deepCopyItem(Object item, Object parentInstance) throws BindingException {
+  default IBoundObject deepCopyItem(IBoundObject item, IBoundObject parentInstance) throws BindingException {
     IBoundInstanceModelGroupedNamed itemInstance = getItemInstance(item);
-    return itemInstance.deepCopyItem(itemInstance, parentInstance);
-  }
-
-  @Override
-  default boolean canHandleJsonPropertyName(@NonNull String name) {
-    return name.equals(getJsonName());
+    return itemInstance.deepCopyItem(item, parentInstance);
   }
 
   @Override
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelField.java
index 2208c2a7b..9890314a1 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelField.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelField.java
@@ -27,6 +27,7 @@
 package gov.nist.secauto.metaschema.databind.model;
 
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.model.impl.DefinitionField;
@@ -39,10 +40,10 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public interface IBoundInstanceModelField extends IBoundInstanceModelNamed, IFieldInstanceAbsolute {
+public interface IBoundInstanceModelField<ITEM> extends IBoundInstanceModelNamed<ITEM>, IFieldInstanceAbsolute {
 
   @Override
-  IBoundDefinitionModelField getDefinition();
+  IBoundDefinitionModelField<ITEM> getDefinition();
 
   /**
    * Create a new bound field instance.
@@ -54,23 +55,26 @@ public interface IBoundInstanceModelField extends IBoundInstanceModelNamed, IFie
    * @return the new instance
    */
   @NonNull
-  static IBoundInstanceModelField newInstance(
+  static IBoundInstanceModelField<?> newInstance(
       @NonNull Field field,
       @NonNull IBoundDefinitionModelAssembly containingDefinition) {
     Class<?> itemType = IBoundInstanceModel.getItemType(field);
-    IBindingContext bindingContext = containingDefinition.getBindingContext();
-    IBoundDefinitionModel definition = bindingContext.getBoundDefinitionForClass(itemType);
 
-    IBoundInstanceModelField retval;
-    if (definition == null) {
-      retval = new InstanceModelFieldScalar(field, containingDefinition);
-    } else if (definition instanceof DefinitionField) {
-      retval = new InstanceModelFieldComplex(field, (DefinitionField) definition, containingDefinition);
+    IBoundInstanceModelField<?> retval;
+    if (IBoundObject.class.isAssignableFrom(itemType)) {
+      IBindingContext bindingContext = containingDefinition.getBindingContext();
+      IBoundDefinitionModel<?> definition
+          = bindingContext.getBoundDefinitionForClass(itemType.asSubclass(IBoundObject.class));
+      if (definition == null) {
+        throw new IllegalStateException(String.format(
+            "The field '%s' on class '%s' is not bound to a Metaschema field",
+            field.toString(),
+            field.getDeclaringClass().getName()));
+      }
+      retval = InstanceModelFieldComplex.newInstance(field, (DefinitionField) definition, containingDefinition);
     } else {
-      throw new IllegalStateException(String.format(
-          "The field '%s' on class '%s' is not bound to a Metaschema field",
-          field.toString(),
-          field.getDeclaringClass().getName()));
+
+      retval = InstanceModelFieldScalar.newInstance(field, containingDefinition);
     }
     return retval;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldComplex.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldComplex.java
index aa49cb056..c75b52c79 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldComplex.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldComplex.java
@@ -26,24 +26,17 @@
 
 package gov.nist.secauto.metaschema.databind.model;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
+import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler;
 import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler;
 import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler;
 
 import java.io.IOException;
 
-import javax.xml.namespace.QName;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 public interface IBoundInstanceModelFieldComplex
-    extends IBoundInstanceModelField, IBoundInstanceModelNamedComplex {
-
-  @Override
-  default IBoundInstanceModelFieldComplex getInstance() {
-    return this;
-  }
+    extends IBoundInstanceModelField<IBoundObject>, IFeatureComplexItemValueHandler {
 
   @Override
   IBoundDefinitionModelFieldComplex getDefinition();
@@ -55,38 +48,32 @@ default boolean isEffectiveValueWrappedInXml() {
   }
 
   @Override
-  @NonNull
-  default QName getXmlQName() {
-    return ObjectUtils.notNull(IBoundInstanceModelField.super.getXmlQName());
-  }
-
-  @Override
-  default Object readItem(Object parent, IItemReadHandler handler) throws IOException {
+  default IBoundObject readItem(IBoundObject parent, IItemReadHandler handler) throws IOException {
     return handler.readItemField(ObjectUtils.requireNonNull(parent, "parent"), this);
   }
 
   @Override
-  default void writeItem(Object item, IItemWriteHandler handler) throws IOException {
+  default void writeItem(IBoundObject item, IItemWriteHandler handler) throws IOException {
     handler.writeItemField(item, this);
   }
 
   @Override
-  default Object deepCopyItem(Object item, Object parentInstance) throws BindingException {
+  default IBoundObject deepCopyItem(IBoundObject item, IBoundObject parentInstance) throws BindingException {
     return getDefinition().deepCopyItem(item, parentInstance);
   }
 
   @Override
-  default Class<?> getBoundClass() {
+  default Class<? extends IBoundObject> getBoundClass() {
     return getDefinition().getBoundClass();
   }
 
   @Override
-  default void callBeforeDeserialize(Object targetObject, Object parentObject) throws BindingException {
+  default void callBeforeDeserialize(IBoundObject targetObject, IBoundObject parentObject) throws BindingException {
     getDefinition().callBeforeDeserialize(targetObject, parentObject);
   }
 
   @Override
-  default void callAfterDeserialize(Object targetObject, Object parentObject) throws BindingException {
+  default void callAfterDeserialize(IBoundObject targetObject, IBoundObject parentObject) throws BindingException {
     getDefinition().callAfterDeserialize(targetObject, parentObject);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldScalar.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldScalar.java
index ae319a54d..76033a9cb 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldScalar.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelFieldScalar.java
@@ -26,65 +26,45 @@
 
 package gov.nist.secauto.metaschema.databind.model;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
+import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.model.info.IFeatureScalarItemValueHandler;
 import gov.nist.secauto.metaschema.databind.model.info.IItemReadHandler;
 import gov.nist.secauto.metaschema.databind.model.info.IItemWriteHandler;
 
 import java.io.IOException;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 public interface IBoundInstanceModelFieldScalar
-    extends IBoundInstanceModelField,
-    IBoundDefinitionModelField, IFeatureScalarItemValueHandler,
-    IFeatureBoundDefinitionInline<IBoundDefinitionModelField, IBoundInstanceModelFieldScalar> {
+    extends IBoundInstanceModelField<Object>,
+    IBoundDefinitionModelField<Object>, IFeatureScalarItemValueHandler,
+    IFeatureDefinitionInstanceInlined<IBoundDefinitionModelField<Object>, IBoundInstanceModelFieldScalar> {
 
   // integrate above
-
-  @Override
-  IBoundDefinitionModelAssembly getContainingDefinition();
-
   @Override
-  default IBoundInstanceModelFieldScalar getInstance() {
-    return this;
-  }
-
-  /**
-   * {@inheritDoc}
-   * <p>
-   * For an inline instance, this instance is the definition.
-   */
-  @Override
-  default IBoundInstanceModelFieldScalar getDefinition() {
-    return this;
+  default IBoundDefinitionModelField<Object> getDefinition() {
+    return IFeatureDefinitionInstanceInlined.super.getDefinition();
   }
 
   @Override
   default IBoundInstanceModelFieldScalar getInlineInstance() {
-    // always inline
-    return this;
+    return IFeatureDefinitionInstanceInlined.super.getInlineInstance();
   }
 
   @Override
-  default IBindingContext getBindingContext() {
-    return getContainingDefinition().getBindingContext();
-  }
+  IBoundDefinitionModelAssembly getContainingDefinition();
 
-  /**
-   * {@inheritDoc}
-   * <p>
-   * Use the effective name of the instance.
-   */
   @Override
-  @NonNull
-  default String getJsonName() {
-    return IBoundInstanceModelField.super.getJsonName();
+  default IContainerFlagSupport<IBoundInstanceFlag> getFlagContainer() {
+    return IContainerFlagSupport.empty();
   }
 
   @Override
-  IBoundInstanceFlag getJsonKeyFlagInstance();
+  default IBoundInstanceFlag getJsonKey() {
+    // no flags
+    return null;
+  }
 
   @Override
   default IBoundInstanceFlag getItemJsonKey(Object item) {
@@ -110,28 +90,8 @@ default IBoundInstanceFlag getJsonValueKeyFlagInstance() {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   * <p>
-   * Always bound to a field.
-   */
-  @Override
-  default Object getValue(Object parent) {
-    return IBoundInstanceModelField.super.getValue(parent);
-  }
-
-  /**
-   * {@inheritDoc}
-   * <p>
-   * Always bound to a field.
-   */
   @Override
-  default void setValue(Object parentObject, Object value) {
-    IBoundInstanceModelField.super.setValue(parentObject, value);
-  }
-
-  @Override
-  default Object readItem(Object parent, IItemReadHandler handler) throws IOException {
+  default Object readItem(IBoundObject parent, IItemReadHandler handler) throws IOException {
     return handler.readItemField(ObjectUtils.requireNonNull(parent, "parent"), this);
   }
 
@@ -139,5 +99,4 @@ default Object readItem(Object parent, IItemReadHandler handler) throws IOExcept
   default void writeItem(Object item, IItemWriteHandler handler) throws IOException {
     handler.writeItemField(item, this);
   }
-
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java
index 80549e7de..249cd94f2 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java
@@ -27,6 +27,7 @@
 package gov.nist.secauto.metaschema.databind.model;
 
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly;
@@ -59,9 +60,9 @@ public interface IBoundInstanceModelGroupedAssembly
   static IBoundInstanceModelGroupedAssembly newInstance(
       @NonNull BoundGroupedAssembly annotation,
       @NonNull IBoundInstanceModelChoiceGroup container) {
-    Class<?> clazz = annotation.binding();
+    Class<? extends IBoundObject> clazz = annotation.binding();
     IBindingContext bindingContext = container.getContainingDefinition().getBindingContext();
-    IBoundDefinitionModel definition = bindingContext.getBoundDefinitionForClass(clazz);
+    IBoundDefinitionModel<?> definition = bindingContext.getBoundDefinitionForClass(clazz);
     if (definition instanceof IBoundDefinitionModelAssembly) {
       return new InstanceModelGroupedAssembly(annotation, (IBoundDefinitionModelAssembly) definition, container);
     }
@@ -79,12 +80,12 @@ static IBoundInstanceModelGroupedAssembly newInstance(
   IBoundDefinitionModelAssembly getDefinition();
 
   @Override
-  default Object readItem(Object parent, @NonNull IItemReadHandler handler) throws IOException {
+  default IBoundObject readItem(IBoundObject parent, @NonNull IItemReadHandler handler) throws IOException {
     return handler.readItemAssembly(ObjectUtils.requireNonNull(parent, "parent"), this);
   }
 
   @Override
-  default void writeItem(Object item, IItemWriteHandler handler) throws IOException {
+  default void writeItem(IBoundObject item, IItemWriteHandler handler) throws IOException {
     handler.writeItemAssembly(item, this);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedField.java
index 90a99a4b9..3fbf85bec 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedField.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedField.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.model;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
@@ -61,14 +62,11 @@ public interface IBoundInstanceModelGroupedField
   static IBoundInstanceModelGroupedField newInstance(
       @NonNull BoundGroupedField annotation,
       @NonNull IBoundInstanceModelChoiceGroup container) {
-    Class<?> clazz = annotation.binding();
+    Class<? extends IBoundObject> clazz = annotation.binding();
     IBindingContext bindingContext = container.getContainingDefinition().getBindingContext();
-    IBoundDefinitionModel definition = bindingContext.getBoundDefinitionForClass(clazz);
+    IBoundDefinitionModel<?> definition = bindingContext.getBoundDefinitionForClass(clazz);
 
-    IBoundInstanceModelGroupedField retval;
-    if (definition instanceof DefinitionField) {
-      retval = new InstanceModelGroupedFieldComplex(annotation, (DefinitionField) definition, container);
-    } else {
+    if (!(definition instanceof DefinitionField)) {
       Field field = container.getField();
       throw new IllegalStateException(String.format(
           "The '%s' annotation, bound to '%s', field '%s' on class '%s' is not bound to a Metaschema field",
@@ -77,19 +75,19 @@ static IBoundInstanceModelGroupedField newInstance(
           field.toString(),
           field.getDeclaringClass().getName()));
     }
-    return retval;
+    return new InstanceModelGroupedFieldComplex(annotation, (DefinitionField) definition, container);
   }
 
   @Override
   IBoundDefinitionModelFieldComplex getDefinition();
 
   @Override
-  default Object readItem(Object parent, @NonNull IItemReadHandler handler) throws IOException {
+  default IBoundObject readItem(IBoundObject parent, @NonNull IItemReadHandler handler) throws IOException {
     return handler.readItemField(ObjectUtils.requireNonNull(parent, "parent"), this);
   }
 
   @Override
-  default void writeItem(Object item, IItemWriteHandler handler) throws IOException {
+  default void writeItem(IBoundObject item, IItemWriteHandler handler) throws IOException {
     handler.writeItemField(item, this);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java
index d031f0a91..a0954d608 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java
@@ -26,9 +26,11 @@
 
 package gov.nist.secauto.metaschema.databind.model;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+import gov.nist.secauto.metaschema.databind.io.BindingException;
 import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler;
 
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -44,12 +46,44 @@ public interface IBoundInstanceModelGroupedNamed
   @Override
   IBoundDefinitionModelComplex getDefinition();
 
+  @Override
   @Nullable
-  default IBoundInstanceFlag getJsonKey() {
-    String jsonKeyName = getJsonKeyFlagName();
+  default IBoundInstanceFlag getEffectiveJsonKey() {
     return JsonGroupAsBehavior.KEYED.equals(getParentContainer().getJsonGroupAsBehavior())
-        ? ObjectUtils.requireNonNull(getDefinition().getFlagInstanceByName(
-            ObjectUtils.requireNonNull(jsonKeyName)))
+        ? getJsonKey()
         : null;
   }
+
+  @Override
+  default IBoundInstanceFlag getJsonKey() {
+    String name = getParentContainer().getJsonKeyFlagInstanceName();
+    return name == null
+        ? null
+        : ObjectUtils.requireNonNull(getDefinition().getFlagInstanceByName(getContainingModule().toFlagQName(name)));
+  }
+
+  @Override
+  default IBoundDefinitionModelAssembly getContainingDefinition() {
+    return getParentContainer().getContainingDefinition();
+  }
+
+  @Override
+  default String getName() {
+    return getDefinition().getName();
+  }
+
+  @Override
+  default IBoundObject deepCopyItem(IBoundObject item, IBoundObject parentInstance) throws BindingException {
+    return getDefinition().deepCopyItem(item, parentInstance);
+  }
+
+  @Override
+  default void callBeforeDeserialize(IBoundObject targetObject, IBoundObject parentObject) throws BindingException {
+    getDefinition().callBeforeDeserialize(targetObject, parentObject);
+  }
+
+  @Override
+  default void callAfterDeserialize(IBoundObject targetObject, IBoundObject parentObject) throws BindingException {
+    getDefinition().callAfterDeserialize(targetObject, parentObject);
+  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelNamed.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelNamed.java
index 7a2e65bec..79b8fda74 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelNamed.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelNamed.java
@@ -28,7 +28,6 @@
 
 import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
 import java.util.Collection;
 
@@ -37,11 +36,12 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IBoundInstanceModelNamed extends IBoundInstanceModel, INamedModelInstanceAbsolute {
+public interface IBoundInstanceModelNamed<ITEM>
+    extends IBoundInstanceModel<ITEM>, INamedModelInstanceAbsolute {
 
   @Override
   @NonNull
-  IBoundDefinitionModel getDefinition();
+  IBoundDefinitionModel<ITEM> getDefinition();
 
   @Override
   default String getName() {
@@ -56,22 +56,21 @@ default Integer getIndex() {
   }
 
   @Override
-  default String getJsonName() {
-    return INamedModelInstanceAbsolute.super.getJsonName();
-  }
-
   @Nullable
-  default IBoundInstanceFlag getJsonKey() {
-    String jsonKeyName = getJsonKeyFlagName();
+  default IBoundInstanceFlag getEffectiveJsonKey() {
     return JsonGroupAsBehavior.KEYED.equals(getJsonGroupAsBehavior())
-        ? ObjectUtils.requireNonNull(getDefinition().getFlagInstanceByName(
-            ObjectUtils.requireNonNull(jsonKeyName)))
+        ? getJsonKey()
         : null;
   }
 
+  @Override
+  default IBoundInstanceFlag getJsonKey() {
+    return getDefinition().getJsonKey();
+  }
+
   @Override
   default IBoundInstanceFlag getItemJsonKey(Object item) {
-    return getJsonKey();
+    return getEffectiveJsonKey();
   }
 
   @Override
@@ -83,9 +82,4 @@ default Collection<? extends Object> getItemValues(Object value) {
   default boolean canHandleXmlQName(QName qname) {
     return qname.equals(getXmlQName());
   }
-
-  @Override
-  default boolean canHandleJsonPropertyName(@NonNull String name) {
-    return name.equals(getJsonName());
-  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelNamedComplex.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelNamedComplex.java
deleted file mode 100644
index f995a568d..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundInstanceModelNamedComplex.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model;
-
-import gov.nist.secauto.metaschema.databind.model.info.IFeatureComplexItemValueHandler;
-
-public interface IBoundInstanceModelNamedComplex extends IBoundInstanceModelNamed, IFeatureComplexItemValueHandler {
-
-  @Override
-  IBoundDefinitionModelComplex getDefinition();
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModule.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModule.java
index 6b9f07381..72bbb2c75 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModule.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModule.java
@@ -32,6 +32,8 @@
 import java.net.URI;
 import java.util.Collection;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface IBoundModule
@@ -39,7 +41,7 @@ public interface IBoundModule
         IBoundModule,
         IBoundDefinitionModelComplex,
         IBoundDefinitionFlag,
-        IBoundDefinitionModelField,
+        IBoundDefinitionModelField<?>,
         IBoundDefinitionModelAssembly> {
 
   /**
@@ -60,11 +62,11 @@ default URI getLocation() { // NOPMD - intentional
   Collection<IBoundDefinitionModelAssembly> getAssemblyDefinitions();
 
   @Override
-  IBoundDefinitionModelAssembly getAssemblyDefinitionByName(@NonNull String name);
+  IBoundDefinitionModelAssembly getAssemblyDefinitionByName(@NonNull QName name);
 
   @Override
-  Collection<IBoundDefinitionModelField> getFieldDefinitions();
+  Collection<IBoundDefinitionModelField<?>> getFieldDefinitions();
 
   @Override
-  IBoundDefinitionModelField getFieldDefinitionByName(@NonNull String name);
+  IBoundDefinitionModelField<?> getFieldDefinitionByName(@NonNull QName name);
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModuleElement.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModuleElement.java
index 223f01e60..c02eb6a3b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModuleElement.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundModuleElement.java
@@ -35,19 +35,11 @@
 /**
  * Represents a binding of Java data to a Metaschema module construct, i.e.
  * definition, instance, field value.
+ *
+ * @param <ITEM>
+ *          the Java type for associated bound objects
  */
-public interface IBoundModuleElement extends IItemValueHandler {
-  /**
-   * Determine if the provided JSON property or YAML key name is associated with
-   * this instance.
-   *
-   * @param name
-   *          the name of the property/key being parsed
-   * @return {@code true} if the instance will handle this name, or {@code false}
-   *         otherwise
-   */
-  boolean canHandleJsonPropertyName(@NonNull String name);
-
+public interface IBoundModuleElement<ITEM> extends IItemValueHandler<ITEM> {
   /**
    * Determine if the provided XML qualified name is associated with this
    * property.
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundProperty.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundProperty.java
index 1cb0b7e93..a76bb1919 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundProperty.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IBoundProperty.java
@@ -26,43 +26,13 @@
 
 package gov.nist.secauto.metaschema.databind.model;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IJsonNamed;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
 
-import java.util.Collection;
-
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public interface IBoundProperty extends IBoundModuleElement, IFeatureJavaField {
-  /**
-   * Get the Metaschema module instance associated with this binding.
-   *
-   * @return the instance
-   */
-  @NonNull
-  IBoundProperty getInstance();
-
-  /**
-   * Get the JSON/YAML property/key name to use for serialization-related
-   * operations.
-   *
-   * @return the JSON name
-   */
-  // REFACTOR: rename to getEffectiveJsonName
-  @NonNull
-  String getJsonName();
-
-  /**
-   * Get the individual item values for this property.
-   * <p>
-   * A property can be single- or multi-valued. This method gets each value in
-   * either case.
-   *
-   * @param propertyValue
-   *          the value for the property, which can be multi-valued
-   * @return the item values
-   */
-  Collection<? extends Object> getItemValues(Object propertyValue);
-
+public interface IBoundProperty<ITEM> extends IBoundModuleElement<ITEM>, IFeatureJavaField, IJsonNamed {
   /**
    * Copy this instance from one parent object to another.
    *
@@ -73,5 +43,5 @@ public interface IBoundProperty extends IBoundModuleElement, IFeatureJavaField {
    * @throws BindingException
    *           if an error occurred while processing the object bindings
    */
-  void deepCopy(@NonNull Object fromInstance, @NonNull Object toInstance) throws BindingException;
+  void deepCopy(@NonNull IBoundObject fromInstance, @NonNull IBoundObject toInstance) throws BindingException;
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IGroupAs.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IGroupAs.java
index 64e9d318e..2b140f364 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IGroupAs.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/IGroupAs.java
@@ -29,6 +29,8 @@
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -39,12 +41,7 @@ public interface IGroupAs {
   @NonNull
   IGroupAs SINGLETON_GROUP_AS = new IGroupAs() {
     @Override
-    public String getGroupAsName() {
-      return null;
-    }
-
-    @Override
-    public String getGroupAsXmlNamespace() {
+    public QName getGroupAsQName() {
       return null;
     }
 
@@ -60,10 +57,19 @@ public XmlGroupAsBehavior getXmlGroupAsBehavior() {
   };
 
   @Nullable
-  String getGroupAsName();
+  QName getGroupAsQName();
+
+  @Nullable
+  default String getGroupAsName() {
+    QName qname = getGroupAsQName();
+    return qname == null ? null : qname.getLocalPart();
+  }
 
   @Nullable
-  String getGroupAsXmlNamespace();
+  default String getGroupAsXmlNamespace() {
+    QName qname = getGroupAsQName();
+    return qname == null ? null : qname.getNamespaceURI();
+  }
 
   @NonNull
   JsonGroupAsBehavior getJsonGroupAsBehavior();
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AllowedValues.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AllowedValues.java
index 18d608477..d36a8f795 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AllowedValues.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/AllowedValues.java
@@ -53,6 +53,7 @@
    *
    * @return the identifier if provided or an empty string otherwise
    */
+  @SuppressWarnings("PMD.ShortMethodName")
   @NonNull
   String id() default "";
 
@@ -141,5 +142,4 @@
    */
   @NonNull
   String remarks() default "";
-
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundAssembly.java
index f31a8570c..24336d38b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundAssembly.java
@@ -1,145 +1,133 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.annotations;
-
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import gov.nist.secauto.metaschema.core.model.IGroupable;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-/**
- * Identifies that the annotation target is a bound property that references a
- * Module assembly.
- * <p>
- * For XML serialization, the {@link #useName()} identifies the name of the
- * element to use and the {@link #namespace()} identifies the namespace of this
- * element.
- * <p>
- * For JSON and YAML serializations, the {@link #useName()} identifies the
- * property/item name to use.
- */
-@Documented
-@Retention(RUNTIME)
-@Target({ FIELD, METHOD, ANNOTATION_TYPE })
-public @interface BoundAssembly {
-  /**
-   * Get the documentary formal name of the assembly.
-   * <p>
-   * If the value is "##none", then the description will be considered
-   * {@code null}.
-   *
-   * @return a markdown string or {@code "##none"} if no formal name is provided
-   */
-  @NonNull
-  String formalName() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * Get the documentary description of the assembly.
-   * <p>
-   * If the value is "##none", then the description will be considered
-   * {@code null}.
-   *
-   * @return a markdown string or {@code "##none"} if no description is provided
-   */
-  @NonNull
-  String description() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * The model name to use for singleton values. This name will be used for
-   * associated XML elements.
-   * <p>
-   * If the value is "##none", then element name is derived from the JavaBean
-   * property name.
-   *
-   * @return the name or {@code "##none"} if no use name is provided
-   */
-  @NonNull
-  String useName() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * The binary use name of the assembly.
-   * <p>
-   * The value {@link Integer#MIN_VALUE} indicates that there is no use name.
-   *
-   * @return the index value
-   */
-  int useIndex() default Integer.MIN_VALUE;
-
-  /**
-   * The namespace to use for associated XML elements.
-   * <p>
-   * If the value is "##default", then element name is derived from the namespace
-   * provided in the package-info.
-   *
-   * @return the namespace
-   */
-  @NonNull
-  String namespace() default ModelUtil.DEFAULT_STRING_VALUE;
-
-  /**
-   * A non-negative number that indicates the minimum occurrence of the model
-   * instance.
-   *
-   * @return a non-negative number
-   */
-  int minOccurs() default IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS;
-
-  /**
-   * A number that indicates the maximum occurrence of the model instance.
-   *
-   * @return a positive number or {@code -1} to indicate "unbounded"
-   */
-  int maxOccurs() default IGroupable.DEFAULT_GROUP_AS_MAX_OCCURS;
-
-  /**
-   * Get any remarks for this field.
-   *
-   * @return a markdown string or {@code "##none"} if no remarks are provided
-   */
-  @NonNull
-  String remarks() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * Used to provide grouping information.
-   * <p>
-   * This annotation is required when the value of {@link #maxOccurs()} is greater
-   * than 1.
-   *
-   * @return the configured {@link GroupAs} or the default value with a
-   *         {@code null} {@link GroupAs#name()}
-   */
-  @NonNull
-  GroupAs groupAs() default @GroupAs(name = ModelUtil.NULL_VALUE);
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.model.annotations;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import gov.nist.secauto.metaschema.core.model.IGroupable;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * Identifies that the annotation target is a bound property that references a
+ * Module assembly.
+ * <p>
+ * For XML serialization, the {@link #useName()} identifies the name of the
+ * element to use for this element.
+ * <p>
+ * For JSON and YAML serializations, the {@link #useName()} identifies the
+ * property/item name to use.
+ */
+@Documented
+@Retention(RUNTIME)
+@Target({ FIELD, METHOD, ANNOTATION_TYPE })
+public @interface BoundAssembly {
+  /**
+   * Get the documentary formal name of the assembly.
+   * <p>
+   * If the value is "##none", then the description will be considered
+   * {@code null}.
+   *
+   * @return a markdown string or {@code "##none"} if no formal name is provided
+   */
+  @NonNull
+  String formalName() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * Get the documentary description of the assembly.
+   * <p>
+   * If the value is "##none", then the description will be considered
+   * {@code null}.
+   *
+   * @return a markdown string or {@code "##none"} if no description is provided
+   */
+  @NonNull
+  String description() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * The model name to use for singleton values. This name will be used for
+   * associated XML elements.
+   * <p>
+   * If the value is "##none", then element name is derived from the JavaBean
+   * property name.
+   *
+   * @return the name or {@code "##none"} if no use name is provided
+   */
+  @NonNull
+  String useName() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * The binary use name of the assembly.
+   * <p>
+   * The value {@link Integer#MIN_VALUE} indicates that there is no use name.
+   *
+   * @return the index value
+   */
+  int useIndex() default Integer.MIN_VALUE;
+
+  /**
+   * A non-negative number that indicates the minimum occurrence of the model
+   * instance.
+   *
+   * @return a non-negative number
+   */
+  int minOccurs() default IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS;
+
+  /**
+   * A number that indicates the maximum occurrence of the model instance.
+   *
+   * @return a positive number or {@code -1} to indicate "unbounded"
+   */
+  int maxOccurs() default IGroupable.DEFAULT_GROUP_AS_MAX_OCCURS;
+
+  /**
+   * Get any remarks for this field.
+   *
+   * @return a markdown string or {@code "##none"} if no remarks are provided
+   */
+  @NonNull
+  String remarks() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * Used to provide grouping information.
+   * <p>
+   * This annotation is required when the value of {@link #maxOccurs()} is greater
+   * than 1.
+   *
+   * @return the configured {@link GroupAs} or the default value with a
+   *         {@code null} {@link GroupAs#name()}
+   */
+  @NonNull
+  GroupAs groupAs() default @GroupAs(name = ModelUtil.NULL_VALUE);
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundField.java
index 7f918300a..a286fe730 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundField.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundField.java
@@ -1,190 +1,179 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.model.IFieldInstance;
-import gov.nist.secauto.metaschema.core.model.IGroupable;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-/**
- * Identifies that the annotation target is a bound property that references a
- * Module field.
- * <p>
- * For XML serialization, the {@link #useName()} identifies the name of the
- * element to use and the {@link #namespace()} identifies the namespace of this
- * element.
- * <p>
- * For JSON and YAML serializations, the {@link #useName()} identifies the
- * property/item name to use.
- * <p>
- * The field must be either:
- * <ol>
- * <li>A Module data type or a collection whose item value is Module data type,
- * with a non-null {@link #typeAdapter()}.
- * <li>A type or a collection whose item value is a type based on a class with a
- * {@link MetaschemaField} annotation, with a property annotated with
- * {@link BoundFieldValue}.</li>
- * </ol>
- */
-@Documented
-@Retention(RUNTIME)
-@Target({ FIELD, METHOD })
-public @interface BoundField {
-  /**
-   * Get the documentary formal name of the field.
-   * <p>
-   * If the value is "##none", then the description will be considered
-   * {@code null}.
-   *
-   * @return a markdown string or {@code "##none"} if no formal name is provided
-   */
-  @NonNull
-  String formalName() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * Get the documentary description of the field.
-   * <p>
-   * If the value is "##none", then the description will be considered
-   * {@code null}.
-   *
-   * @return a markdown string or {@code "##none"} if no description is provided
-   */
-  @NonNull
-  String description() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * The model name to use for JSON/YAML singleton values and associated XML
-   * elements.
-   * <p>
-   * If the value is "##none", then the use name will be provided by the
-   * definition or by the field name if the item value class is missing the
-   * {@link MetaschemaField} annotation.
-   *
-   * @return the name
-   */
-  @NonNull
-  String useName() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * The binary use name of the field.
-   * <p>
-   * The value {@link Integer#MIN_VALUE} indicates that there is no use name.
-   *
-   * @return the index value
-   */
-  int useIndex() default Integer.MIN_VALUE;
-
-  /**
-   * The Metaschema data type adapter for the field's value.
-   *
-   * @return the data type adapter
-   */
-  @NonNull
-  Class<? extends IDataTypeAdapter<?>> typeAdapter() default NullJavaTypeAdapter.class;
-
-  /**
-   * The default value of the field represented as a string.
-   * <p>
-   * The value {@link ModelUtil#NULL_VALUE} is used to indicate if no default
-   * value is provided.
-   *
-   * @return the default value
-   */
-  @NonNull
-  String defaultValue() default ModelUtil.NULL_VALUE;
-
-  /**
-   * The namespace to use for associated XML elements.
-   * <p>
-   * If the value is "##default", then element name is derived from the namespace
-   * provided in the package-info.
-   *
-   * @return the namespace
-   */
-  String namespace() default ModelUtil.DEFAULT_STRING_VALUE;
-
-  /**
-   * If the data type allows it, determines if the field's value must be wrapped
-   * with an XML element.
-   *
-   * @return {@code true} if the field must be wrapped, or {@code false} otherwise
-   */
-  boolean inXmlWrapped() default IFieldInstance.DEFAULT_FIELD_IN_XML_WRAPPED;
-
-  /**
-   * A non-negative number that indicates the minimum occurrence of the model
-   * instance.
-   *
-   * @return a non-negative number
-   */
-  int minOccurs() default IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS;
-
-  /**
-   * A number that indicates the maximum occurrence of the model instance.
-   *
-   * @return a positive number or {@code -1} to indicate "unbounded"
-   */
-  int maxOccurs() default IGroupable.DEFAULT_GROUP_AS_MAX_OCCURS;
-
-  /**
-   * Get any remarks for this field.
-   *
-   * @return a markdown string or {@code "##none"} if no remarks are provided
-   */
-  @NonNull
-  String remarks() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * Used to provide grouping information.
-   * <p>
-   * This annotation is required when the value of {@link #maxOccurs()} is greater
-   * than 1.
-   *
-   * @return the configured {@link GroupAs} or the default value with a
-   *         {@code null} {@link GroupAs#name()}
-   */
-  @NonNull
-  GroupAs groupAs() default @GroupAs(name = ModelUtil.NULL_VALUE);
-
-  /**
-   * Get the value constraints defined for this Metaschema field inline
-   * definition.
-   *
-   * @return the value constraints
-   */
-  ValueConstraints valueConstraints() default @ValueConstraints;
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.model.annotations;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.model.IFieldInstance;
+import gov.nist.secauto.metaschema.core.model.IGroupable;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * Identifies that the annotation target is a bound property that references a
+ * Module field.
+ * <p>
+ * For XML serialization, the {@link #useName()} identifies the name of the
+ * element to use for this element.
+ * <p>
+ * For JSON and YAML serializations, the {@link #useName()} identifies the
+ * property/item name to use.
+ * <p>
+ * The field must be either:
+ * <ol>
+ * <li>A Module data type or a collection whose item value is Module data type,
+ * with a non-null {@link #typeAdapter()}.
+ * <li>A type or a collection whose item value is a type based on a class with a
+ * {@link MetaschemaField} annotation, with a property annotated with
+ * {@link BoundFieldValue}.</li>
+ * </ol>
+ */
+@Documented
+@Retention(RUNTIME)
+@Target({ FIELD, METHOD })
+public @interface BoundField {
+  /**
+   * Get the documentary formal name of the field.
+   * <p>
+   * If the value is "##none", then the description will be considered
+   * {@code null}.
+   *
+   * @return a markdown string or {@code "##none"} if no formal name is provided
+   */
+  @NonNull
+  String formalName() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * Get the documentary description of the field.
+   * <p>
+   * If the value is "##none", then the description will be considered
+   * {@code null}.
+   *
+   * @return a markdown string or {@code "##none"} if no description is provided
+   */
+  @NonNull
+  String description() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * The model name to use for JSON/YAML singleton values and associated XML
+   * elements.
+   * <p>
+   * If the value is "##none", then the use name will be provided by the
+   * definition or by the field name if the item value class is missing the
+   * {@link MetaschemaField} annotation.
+   *
+   * @return the name
+   */
+  @NonNull
+  String useName() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * The binary use name of the field.
+   * <p>
+   * The value {@link Integer#MIN_VALUE} indicates that there is no use name.
+   *
+   * @return the index value
+   */
+  int useIndex() default Integer.MIN_VALUE;
+
+  /**
+   * The Metaschema data type adapter for the field's value.
+   *
+   * @return the data type adapter
+   */
+  @NonNull
+  Class<? extends IDataTypeAdapter<?>> typeAdapter() default NullJavaTypeAdapter.class;
+
+  /**
+   * The default value of the field represented as a string.
+   * <p>
+   * The value {@link ModelUtil#NULL_VALUE} is used to indicate if no default
+   * value is provided.
+   *
+   * @return the default value
+   */
+  @NonNull
+  String defaultValue() default ModelUtil.NULL_VALUE;
+
+  /**
+   * If the data type allows it, determines if the field's value must be wrapped
+   * with an XML element.
+   *
+   * @return {@code true} if the field must be wrapped, or {@code false} otherwise
+   */
+  boolean inXmlWrapped() default IFieldInstance.DEFAULT_FIELD_IN_XML_WRAPPED;
+
+  /**
+   * A non-negative number that indicates the minimum occurrence of the model
+   * instance.
+   *
+   * @return a non-negative number
+   */
+  int minOccurs() default IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS;
+
+  /**
+   * A number that indicates the maximum occurrence of the model instance.
+   *
+   * @return a positive number or {@code -1} to indicate "unbounded"
+   */
+  int maxOccurs() default IGroupable.DEFAULT_GROUP_AS_MAX_OCCURS;
+
+  /**
+   * Get any remarks for this field.
+   *
+   * @return a markdown string or {@code "##none"} if no remarks are provided
+   */
+  @NonNull
+  String remarks() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * Used to provide grouping information.
+   * <p>
+   * This annotation is required when the value of {@link #maxOccurs()} is greater
+   * than 1.
+   *
+   * @return the configured {@link GroupAs} or the default value with a
+   *         {@code null} {@link GroupAs#name()}
+   */
+  @NonNull
+  GroupAs groupAs() default @GroupAs(name = ModelUtil.NULL_VALUE);
+
+  /**
+   * Get the value constraints defined for this Metaschema field inline
+   * definition.
+   *
+   * @return the value constraints
+   */
+  ValueConstraints valueConstraints() default @ValueConstraints;
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundFlag.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundFlag.java
index 4a5f2833d..d7bcdc12f 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundFlag.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundFlag.java
@@ -1,146 +1,134 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-/**
- * Identifies that the annotation target is a bound property that represents a
- * Module flag.
- */
-@Documented
-@Retention(RUNTIME)
-@Target({ FIELD, METHOD })
-public @interface BoundFlag {
-  /**
-   * Get the documentary formal name of the flag.
-   * <p>
-   * If the value is "##none", then the description will be considered
-   * {@code null}.
-   *
-   * @return a markdown string or {@code "##none"} if no formal name is provided
-   */
-  @NonNull
-  String formalName() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * Get the documentary description of the flag.
-   * <p>
-   * If the value is "##none", then the description will be considered
-   * {@code null}.
-   *
-   * @return a markdown string or {@code "##none"} if no description is provided
-   */
-  @NonNull
-  String description() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * The model name to use for singleton values. This name will be used for
-   * associated XML attributes and JSON properties.
-   * <p>
-   * If the value is "##none", then element name is derived from the JavaBean
-   * property name.
-   *
-   * @return the name
-   */
-  @NonNull
-  String name() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * The binary use name of the flag.
-   * <p>
-   * The value {@link Integer#MIN_VALUE} indicates that there is no use name.
-   *
-   * @return the index value
-   */
-  int useIndex() default Integer.MIN_VALUE;
-
-  /**
-   * XML target namespace of the XML Schema element.
-   * <p>
-   * If the value is "##default", then namespace is derived from the namespace
-   * provided in the package-info. If the value is "##none", the namespace will be
-   * {@code null}.
-   *
-   * @return the namespace
-   */
-  @NonNull
-  String namespace() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * The default value of the flag represented as a string.
-   * <p>
-   * The value {@link ModelUtil#NULL_VALUE} is used to indicate if no default
-   * value is provided.
-   *
-   * @return the default value
-   */
-  @NonNull
-  String defaultValue() default ModelUtil.NULL_VALUE;
-
-  /**
-   * Specifies if the XML Schema attribute is optional or required. If true, then
-   * the JavaBean property is mapped to a XML Schema attribute that is required.
-   * Otherwise it is mapped to a XML Schema attribute that is optional.
-   *
-   * @return {@code true} if the flag must occur, or {@code false} otherwise
-   */
-  boolean required() default false;
-
-  /**
-   * The Module data type adapter for the field's value.
-   *
-   * @return the data type adapter
-   */
-  @NonNull
-  Class<? extends IDataTypeAdapter<?>> typeAdapter() default NullJavaTypeAdapter.class;
-
-  /**
-   * Get any remarks for this flag.
-   *
-   * @return a markdown string or {@code "##none"} if no remarks are provided
-   */
-  @NonNull
-  String remarks() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * Get the value constraints defined for this Metaschema flag inline definition.
-   *
-   * @return the value constraints
-   */
-  ValueConstraints valueConstraints() default @ValueConstraints;
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.model.annotations;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * Identifies that the annotation target is a bound property that represents a
+ * Module flag.
+ */
+@Documented
+@Retention(RUNTIME)
+@Target({ FIELD, METHOD })
+public @interface BoundFlag {
+  /**
+   * Get the documentary formal name of the flag.
+   * <p>
+   * If the value is "##none", then the description will be considered
+   * {@code null}.
+   *
+   * @return a markdown string or {@code "##none"} if no formal name is provided
+   */
+  @NonNull
+  String formalName() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * Get the documentary description of the flag.
+   * <p>
+   * If the value is "##none", then the description will be considered
+   * {@code null}.
+   *
+   * @return a markdown string or {@code "##none"} if no description is provided
+   */
+  @NonNull
+  String description() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * The model name to use for singleton values. This name will be used for
+   * associated XML attributes and JSON properties.
+   * <p>
+   * If the value is "##none", then element name is derived from the JavaBean
+   * property name.
+   *
+   * @return the name
+   */
+  @NonNull
+  String name() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * The binary use name of the flag.
+   * <p>
+   * The value {@link Integer#MIN_VALUE} indicates that there is no use name.
+   *
+   * @return the index value
+   */
+  int useIndex() default Integer.MIN_VALUE;
+
+  /**
+   * The default value of the flag represented as a string.
+   * <p>
+   * The value {@link ModelUtil#NULL_VALUE} is used to indicate if no default
+   * value is provided.
+   *
+   * @return the default value
+   */
+  @NonNull
+  String defaultValue() default ModelUtil.NULL_VALUE;
+
+  /**
+   * Specifies if the XML Schema attribute is optional or required. If true, then
+   * the JavaBean property is mapped to a XML Schema attribute that is required.
+   * Otherwise it is mapped to a XML Schema attribute that is optional.
+   *
+   * @return {@code true} if the flag must occur, or {@code false} otherwise
+   */
+  boolean required() default false;
+
+  /**
+   * The Module data type adapter for the field's value.
+   *
+   * @return the data type adapter
+   */
+  @NonNull
+  Class<? extends IDataTypeAdapter<?>> typeAdapter() default NullJavaTypeAdapter.class;
+
+  /**
+   * Get any remarks for this flag.
+   *
+   * @return a markdown string or {@code "##none"} if no remarks are provided
+   */
+  @NonNull
+  String remarks() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * Get the value constraints defined for this Metaschema flag inline definition.
+   *
+   * @return the value constraints
+   */
+  ValueConstraints valueConstraints() default @ValueConstraints;
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedAssembly.java
index 0182629e3..42b5e4420 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedAssembly.java
@@ -31,6 +31,8 @@
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -42,8 +44,7 @@
  * Module assembly.
  * <p>
  * For XML serialization, the {@link #useName()} identifies the name of the
- * element to use and the {@link #namespace()} identifies the namespace of this
- * element.
+ * element to use for this element.
  * <p>
  * For JSON and YAML serializations, the {@link #useName()} identifies the
  * property/item name to use.
@@ -95,17 +96,6 @@
    */
   int useIndex() default Integer.MIN_VALUE;
 
-  /**
-   * The namespace to use for associated XML elements.
-   * <p>
-   * If the value is "##default", then element name is derived from the namespace
-   * provided in the package-info.
-   *
-   * @return the namespace
-   */
-  @NonNull
-  String namespace() default ModelUtil.DEFAULT_STRING_VALUE;
-
   /**
    * Get any remarks for this field.
    *
@@ -132,5 +122,5 @@
    * @return the bound class
    */
   @NonNull
-  Class<?> binding();
+  Class<? extends IBoundObject> binding();
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedField.java
index d0f414c9b..f75f6042b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedField.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/BoundGroupedField.java
@@ -31,6 +31,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -43,8 +44,7 @@
  * Module field.
  * <p>
  * For XML serialization, the {@link #useName()} identifies the name of the
- * element to use and the {@link #namespace()} identifies the namespace of this
- * element.
+ * element to use for this element.
  * <p>
  * For JSON and YAML serializations, the {@link #useName()} identifies the
  * property/item name to use.
@@ -114,16 +114,6 @@
   @NonNull
   Class<? extends IDataTypeAdapter<?>> typeAdapter() default NullJavaTypeAdapter.class;
 
-  /**
-   * The namespace to use for associated XML elements.
-   * <p>
-   * If the value is "##default", then element name is derived from the namespace
-   * provided in the package-info.
-   *
-   * @return the namespace
-   */
-  String namespace() default ModelUtil.DEFAULT_STRING_VALUE;
-
   /**
    * Get any remarks for this field.
    *
@@ -158,5 +148,5 @@
    * @return the bound class
    */
   @NonNull
-  Class<?> binding();
+  Class<? extends IBoundObject> binding();
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Expect.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Expect.java
index 781fa8963..2fb42dad0 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Expect.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Expect.java
@@ -52,6 +52,7 @@
    *
    * @return the identifier if provided or an empty string otherwise
    */
+  @SuppressWarnings("PMD.ShortMethodName")
   @NonNull
   String id() default "";
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/GroupAs.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/GroupAs.java
index 1978957f2..d7ddd08a2 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/GroupAs.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/GroupAs.java
@@ -51,17 +51,6 @@
   @NonNull
   String name();
 
-  /**
-   * XML target namespace of the XML grouping element.
-   * <p>
-   * If the value is "##default", then element name is derived from the namespace
-   * provided in the package-info.
-   *
-   * @return the namespace
-   */
-  @NonNull
-  String namespace() default ModelUtil.DEFAULT_STRING_VALUE;
-
   /**
    * Describes how to handle collections in JSON/YAML.
    *
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/HasCardinality.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/HasCardinality.java
index 1879f1c63..5f33d68e6 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/HasCardinality.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/HasCardinality.java
@@ -52,6 +52,7 @@
    *
    * @return the identifier if provided or an empty string otherwise
    */
+  @SuppressWarnings("PMD.ShortMethodName")
   @NonNull
   String id() default "";
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Ignore.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Ignore.java
index 9ae50c923..f8cc50121 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Ignore.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Ignore.java
@@ -1,42 +1,42 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that the property is to be ignored by the Module binding system.
- */
-@Retention(RUNTIME)
-@Target({ FIELD })
-public @interface Ignore {
-  // no fields
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.model.annotations;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that the property is to be ignored by the Module binding system.
+ */
+@Retention(RUNTIME)
+@Target({ FIELD })
+public @interface Ignore {
+  // no fields
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Index.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Index.java
index f12f7a676..62d8d765f 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Index.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Index.java
@@ -52,6 +52,7 @@
    *
    * @return the identifier if provided or an empty string otherwise
    */
+  @SuppressWarnings("PMD.ShortMethodName")
   @NonNull
   String id() default "";
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IndexHasKey.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IndexHasKey.java
index 4623f3770..7f3328d06 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IndexHasKey.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IndexHasKey.java
@@ -55,6 +55,7 @@
    *
    * @return the identifier if provided or an empty string otherwise
    */
+  @SuppressWarnings("PMD.ShortMethodName")
   @NonNull
   String id() default "";
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IsUnique.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IsUnique.java
index 81178fb65..2bd008d77 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IsUnique.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/IsUnique.java
@@ -53,6 +53,7 @@
    *
    * @return the identifier if provided or an empty string otherwise
    */
+  @SuppressWarnings("PMD.ShortMethodName")
   @NonNull
   String id() default "";
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonFieldValueKeyFlag.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonFieldValueKeyFlag.java
index 3405c1bde..aee6e7118 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonFieldValueKeyFlag.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonFieldValueKeyFlag.java
@@ -1,50 +1,50 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that the target of this annotation is a flag whose value should be
- * the property/item name of the field's value in JSON or YAML.
- * <p>
- * Use of this annotation is mutually exclusive with the {@link BoundFieldValue}
- * annotation.
- */
-// TODO: remove this and move this to MetaschemaField
-@Documented
-@Retention(RUNTIME)
-@Target({ FIELD, METHOD })
-public @interface JsonFieldValueKeyFlag {
-  // no fields
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.model.annotations;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that the target of this annotation is a flag whose value should be
+ * the property/item name of the field's value in JSON or YAML.
+ * <p>
+ * Use of this annotation is mutually exclusive with the {@link BoundFieldValue}
+ * annotation.
+ */
+// TODO: remove this and move this to MetaschemaField
+@Documented
+@Retention(RUNTIME)
+@Target({ FIELD, METHOD })
+public @interface JsonFieldValueKeyFlag {
+  // no fields
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonKey.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonKey.java
index 13989fd4d..1549f389c 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonKey.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/JsonKey.java
@@ -1,48 +1,48 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that the target of this annotation is a Java property that is to be
- * used as the JSON or YAML property/item name in for a collection of similar
- * objects/items.
- */
-// TODO: remove this and move this to MetaschemaField/MetaschemaAssembly
-@Documented
-@Retention(RUNTIME)
-@Target({ FIELD, METHOD })
-public @interface JsonKey {
-  // no fields
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.model.annotations;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that the target of this annotation is a Java property that is to be
+ * used as the JSON or YAML property/item name in for a collection of similar
+ * objects/items.
+ */
+// TODO: remove this and move this to MetaschemaField/MetaschemaAssembly
+@Documented
+@Retention(RUNTIME)
+@Target({ FIELD, METHOD })
+public @interface JsonKey {
+  // no fields
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Matches.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Matches.java
index f82dd742d..df8c7c6ff 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Matches.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Matches.java
@@ -55,6 +55,7 @@
    *
    * @return the identifier if provided or an empty string otherwise
    */
+  @SuppressWarnings("PMD.ShortMethodName")
   @NonNull
   String id() default "";
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaAssembly.java
index c1b14be32..5781f9fe0 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaAssembly.java
@@ -1,146 +1,135 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import gov.nist.secauto.metaschema.databind.model.IBoundModule;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-/**
- * This annotation indicates that the target class represents a Module assembly.
- */
-@Documented
-@Retention(RUNTIME)
-@Target(TYPE)
-public @interface MetaschemaAssembly {
-  /**
-   * Get the documentary formal name of the assembly.
-   * <p>
-   * If the value is "##none", then the description will be considered
-   * {@code null}.
-   *
-   * @return a Markdown string or {@code "##none"} if no formal name is provided
-   */
-  @NonNull
-  String formalName() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * Get the documentary description of the assembly.
-   * <p>
-   * If the value is "##none", then the description will be considered
-   * {@code null}.
-   *
-   * @return a markdown string or {@code "##none"} if no description is provided
-   */
-  @NonNull
-  String description() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * Get the Metaschema module class that "owns" this assembly, which is the
-   * concrete implementation of the module containing the assembly.
-   *
-   * @return the {@link IBoundModule} class
-   */
-  @NonNull
-  Class<? extends IBoundModule> moduleClass();
-
-  /**
-   * Name of the assembly.
-   *
-   * @return the name
-   */
-  @NonNull
-  String name();
-
-  /**
-   * The binary name of the assembly.
-   * <p>
-   * The value {@link Integer#MIN_VALUE} indicates that there is no index.
-   *
-   * @return the index value
-   */
-  int index() default Integer.MIN_VALUE;
-
-  /**
-   * Name of the root XML element or the JSON/YAML property.
-   * <p>
-   * If the value is "##none", then there is no root name.
-   *
-   * @return the name
-   */
-  @NonNull
-  String rootName() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * The binary root name of the assembly.
-   * <p>
-   * The value {@link Integer#MIN_VALUE} indicates that there is no root index.
-   *
-   * @return the index value
-   */
-  int rootIndex() default Integer.MIN_VALUE;
-
-  /**
-   * XML target namespace of the XML element.
-   * <p>
-   * If the value is "##default", then namespace is derived from the namespace
-   * provided in the package-info.
-   *
-   * @return the namespace
-   */
-  @NonNull
-  String rootNamespace() default ModelUtil.DEFAULT_STRING_VALUE;
-
-  /**
-   * Get any remarks for this assembly.
-   *
-   * @return a markdown string or {@code "##none"} if no remarks are provided
-   */
-  @NonNull
-  String remarks() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * Get the value constraints defined for this Metaschema assembly definition.
-   *
-   * @return the value constraints
-   */
-  ValueConstraints valueConstraints() default @ValueConstraints;
-
-  /**
-   * Get the model constraints defined for this Metaschema assembly definition.
-   *
-   * @return the value constraints
-   */
-  AssemblyConstraints modelConstraints() default @AssemblyConstraints;
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.model.annotations;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import gov.nist.secauto.metaschema.databind.model.IBoundModule;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+/**
+ * This annotation indicates that the target class represents a Module assembly.
+ */
+@Documented
+@Retention(RUNTIME)
+@Target(TYPE)
+public @interface MetaschemaAssembly {
+  /**
+   * Get the documentary formal name of the assembly.
+   * <p>
+   * If the value is "##none", then the description will be considered
+   * {@code null}.
+   *
+   * @return a Markdown string or {@code "##none"} if no formal name is provided
+   */
+  @NonNull
+  String formalName() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * Get the documentary description of the assembly.
+   * <p>
+   * If the value is "##none", then the description will be considered
+   * {@code null}.
+   *
+   * @return a markdown string or {@code "##none"} if no description is provided
+   */
+  @NonNull
+  String description() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * Get the Metaschema module class that "owns" this assembly, which is the
+   * concrete implementation of the module containing the assembly.
+   *
+   * @return the {@link IBoundModule} class
+   */
+  @NonNull
+  Class<? extends IBoundModule> moduleClass();
+
+  /**
+   * Name of the assembly.
+   *
+   * @return the name
+   */
+  @NonNull
+  String name();
+
+  /**
+   * The binary name of the assembly.
+   * <p>
+   * The value {@link Integer#MIN_VALUE} indicates that there is no index.
+   *
+   * @return the index value
+   */
+  int index() default Integer.MIN_VALUE;
+
+  /**
+   * Name of the root XML element or the JSON/YAML property.
+   * <p>
+   * If the value is "##none", then there is no root name.
+   *
+   * @return the name
+   */
+  @NonNull
+  String rootName() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * The binary root name of the assembly.
+   * <p>
+   * The value {@link Integer#MIN_VALUE} indicates that there is no root index.
+   *
+   * @return the index value
+   */
+  int rootIndex() default Integer.MIN_VALUE;
+
+  /**
+   * Get any remarks for this assembly.
+   *
+   * @return a markdown string or {@code "##none"} if no remarks are provided
+   */
+  @NonNull
+  String remarks() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * Get the value constraints defined for this Metaschema assembly definition.
+   *
+   * @return the value constraints
+   */
+  ValueConstraints valueConstraints() default @ValueConstraints;
+
+  /**
+   * Get the model constraints defined for this Metaschema assembly definition.
+   *
+   * @return the value constraints
+   */
+  AssemblyConstraints modelConstraints() default @AssemblyConstraints;
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaField.java
index 1102635aa..7d018dcd6 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaField.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaField.java
@@ -87,15 +87,28 @@
    */
   int index() default Integer.MIN_VALUE;
 
+  /**
+   * Get the name to use for data instances of this field.
+   * <p>
+   * This overrides the name provided by {@link #name()}.
+   * <p>
+   * The value {@link ModelUtil#NO_STRING_VALUE} indicates that there is no use
+   * name.
+   *
+   *
+   * @return the use name or {@link ModelUtil#NO_STRING_VALUE} if no use name is
+   *         provided
+   */
   @NonNull
   String useName() default ModelUtil.NO_STRING_VALUE;
 
   /**
    * The binary use name of the assembly.
    * <p>
-   * The value {@link Integer#MIN_VALUE} indicates that there is no use name.
+   * The value {@link Integer#MIN_VALUE} indicates that there is no index.
    *
-   * @return the index value
+   * @return the index value or {@link Integer#MIN_VALUE} if there is no index
+   *         value
    */
   int useIndex() default Integer.MIN_VALUE;
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Module.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaModule.java
similarity index 93%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Module.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaModule.java
index 1e8cf7f11..a31e0a01c 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/Module.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/MetaschemaModule.java
@@ -28,6 +28,7 @@
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.databind.model.IBoundModule;
 
 import java.lang.annotation.ElementType;
@@ -38,14 +39,14 @@
 
 @Retention(RUNTIME)
 @Target(ElementType.TYPE)
-public @interface Module {
+public @interface MetaschemaModule {
   /**
    * Get the classes representing the global fields defined on this Module.
    *
    * @return an array of field classes
    */
   @NonNull
-  Class<?>[] fields() default {};
+  Class<? extends IBoundObject>[] fields() default {};
 
   /**
    * Get the classes representing the global assemblies defined on this Module.
@@ -53,7 +54,7 @@
    * @return an array of assembly classes
    */
   @NonNull
-  Class<?>[] assemblies() default {};
+  Class<? extends IBoundObject>[] assemblies() default {};
 
   /**
    * Get the classes representing the Metaschemas imported by this Module.
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/ModelUtil.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/ModelUtil.java
index cb63d0cdc..f46b06c3f 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/ModelUtil.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/ModelUtil.java
@@ -30,12 +30,17 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
+import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.model.IGroupAs;
+import gov.nist.secauto.metaschema.databind.model.impl.DefaultGroupAs;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
+import java.net.URI;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -58,6 +63,19 @@ private ModelUtil() {
     // disable construction
   }
 
+  /**
+   * Get the requested annotation from the provided Java class.
+   *
+   * @param <A>
+   *          the annotation Java type
+   * @param clazz
+   *          the Java class to get the annotation from
+   * @param annotationClass
+   *          the annotation class instance
+   * @return the annotation
+   * @throws IllegalArgumentException
+   *           if the annotation was not present on the class
+   */
   @NonNull
   public static <A extends Annotation> A getAnnotation(
       @NonNull Class<?> clazz,
@@ -72,6 +90,19 @@ public static <A extends Annotation> A getAnnotation(
     return annotation;
   }
 
+  /**
+   * Get the requested annotation from the provided Java field.
+   *
+   * @param <A>
+   *          the annotation Java type
+   * @param javaField
+   *          the Java field to get the annotation from
+   * @param annotationClass
+   *          the annotation class instance
+   * @return the annotation
+   * @throws IllegalArgumentException
+   *           if the annotation was not present on the field
+   */
   @NonNull
   public static <A extends Annotation> A getAnnotation(
       @NonNull Field javaField,
@@ -110,43 +141,6 @@ public static String resolveNoneOrDefault(@Nullable String value, @Nullable Stri
     return retval;
   }
 
-  @Nullable
-  public static String resolveOptionalNamespace(String annotationValue) {
-    return resolveNamespace(annotationValue, true);
-  }
-
-  @NonNull
-  public static String resolveNamespace(String annotationValue) {
-    return ObjectUtils.requireNonNull(resolveNamespace(annotationValue, false));
-  }
-
-  /**
-   * Resolves a provided namespace value. If the value is {@code null} or
-   * "##default", then the provided default value will be used instead. If the
-   * value is "##none" and {@code allowNone} is {@code true}, then an empty string
-   * value will be used. Otherwise, the value is returned.
-   *
-   * @param value
-   *          the requested value
-   * @param definition
-   *          a class with the {@link XmlSchema} annotation
-   * @param allowNone
-   *          if the "##none" value is honored
-   * @return the resolved value or {@code null} if no namespace is defined
-   */
-  private static String resolveNamespace(String value, boolean allowNone) {
-    String retval;
-    if (value == null || DEFAULT_STRING_VALUE.equals(value)) {
-      // get namespace from the metaschema
-      retval = null;
-    } else if (allowNone && NO_STRING_VALUE.equals(value)) {
-      retval = ""; // NOPMD - intentional
-    } else {
-      retval = value;
-    }
-    return retval;
-  }
-
   /**
    * Get the processed value of a string. If the value is "##none", then the value
    * will be {@code null}. Otherwise the value is returned.
@@ -186,6 +180,19 @@ public static MarkupMultiline resolveToMarkupMultiline(@NonNull String value) {
     return resolveNoneOrValue(value) == null ? null : MarkupMultiline.fromMarkdown(value);
   }
 
+  /**
+   * Get the data type adapter instance of the provided adapter class.
+   * <p>
+   * If the provided adapter Java class is the {@link NullJavaTypeAdapter} class,
+   * then the default data type adapter will be returned.
+   *
+   * @param adapterClass
+   *          the data type adapter class to get the data type adapter instance
+   *          for
+   * @param bindingContext
+   *          the Metaschema binding context used to lookup the data type adapter
+   * @return the data type adapter
+   */
   @NonNull
   public static IDataTypeAdapter<?> getDataTypeAdapter(
       @NonNull Class<? extends IDataTypeAdapter<?>> adapterClass,
@@ -199,6 +206,21 @@ public static IDataTypeAdapter<?> getDataTypeAdapter(
     return retval;
   }
 
+  /**
+   * Given a provided default value string, get the data type specific default
+   * value using the provided data type adapter.
+   * <p>
+   * If the provided default value is {@link ModelUtil#NULL_VALUE}, then this
+   * method will return a {@code null} value.
+   *
+   * @param defaultValue
+   *          the string representation of the default value
+   * @param adapter
+   *          the data type adapter instance used to cast the default string value
+   *          to a data type specific object
+   * @return the data type specific object or {@code null} if the provided default
+   *         value was {@link ModelUtil#NULL_VALUE}
+   */
   @Nullable
   public static Object resolveDefaultValue(@NonNull String defaultValue, IDataTypeAdapter<?> adapter) {
     Object retval = null;
@@ -208,22 +230,61 @@ public static Object resolveDefaultValue(@NonNull String defaultValue, IDataType
     return retval;
   }
 
-  public static Integer resolveNullOrInteger(int value) {
+  /**
+   * Resolves an integer value by determining if an actual value is provided or
+   * -2^31, which indicates that no actual value was provided.
+   * <p>
+   * The integer value -2^31 cannot be used, since this indicates no value.
+   *
+   * @param value
+   *          the integer value to resolve
+   * @return the integer value or {@code null} if the provided value was -2^31
+   */
+  public static Integer resolveDefaultInteger(int value) {
     return value == Integer.MIN_VALUE ? null : value;
   }
 
-  public static Object resolveNullOrValue(
-      @NonNull String defaultValue,
-      @NonNull IDataTypeAdapter<?> javaTypeAdapter) {
-    return NULL_VALUE.equals(defaultValue)
-        ? null
-        : javaTypeAdapter.parse(defaultValue);
-  }
-
+  /**
+   * Resolves a {@link GroupAs} annotation determining if an actual value is
+   * provided or if the value is the default, which indicates that no actual
+   * GroupAs was provided.
+   *
+   * @param groupAs
+   *          the GroupAs value to resolve
+   * @param module
+   *          the containing module instance
+   * @return a new {@link IGroupAs} instance or a singleton group as if the
+   *         provided value was the default value
+   */
   @NonNull
-  public static IGroupAs groupAs(@NonNull GroupAs groupAs) {
+  public static IGroupAs resolveDefaultGroupAs(
+      @NonNull GroupAs groupAs,
+      @NonNull IModule module) {
     return NULL_VALUE.equals(groupAs.name())
         ? IGroupAs.SINGLETON_GROUP_AS
-        : new DefaultGroupAs(groupAs);
+        : new DefaultGroupAs(groupAs, module);
+  }
+
+  public static String toLocation(@NonNull IBoundObject obj) {
+    IMetaschemaData data = obj.getMetaschemaData();
+
+    String retval = "";
+    if (data != null) {
+      int line = data.getLine();
+      if (line > -1) {
+        retval = line + ":" + data.getColumn();
+      }
+    }
+    return retval;
+  }
+
+  public static String toLocation(@NonNull IBoundObject obj, @Nullable URI uri) {
+    String retval = uri == null ? "" : uri.toASCIIString();
+
+    String location = toLocation(obj);
+    if (!location.isEmpty()) {
+      retval = retval.isEmpty() ? location : retval + "@" + location;
+    }
+    return retval;
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/NullJavaTypeAdapter.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/NullJavaTypeAdapter.java
index 85b941e42..21ec21808 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/NullJavaTypeAdapter.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/NullJavaTypeAdapter.java
@@ -31,10 +31,13 @@
 import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
+import gov.nist.secauto.metaschema.core.metapath.item.function.IMapKey;
 import gov.nist.secauto.metaschema.databind.model.annotations.NullJavaTypeAdapter.VoidItem;
 
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
@@ -53,7 +56,6 @@ public class NullJavaTypeAdapter
    */
   public NullJavaTypeAdapter(@NonNull Class<Void> clazz) {
     super(clazz);
-    throw new UnsupportedOperationException(NOT_VALID);
   }
 
   @Override
@@ -77,7 +79,7 @@ public VoidItem newItem(Object value) {
   }
 
   @Override
-  public List<String> getNames() {
+  public List<QName> getNames() {
     throw new UnsupportedOperationException(NOT_VALID);
   }
 
@@ -120,5 +122,10 @@ public IAnyAtomicItem castAsType(IAnyAtomicItem item) {
     public int compareTo(IAnyAtomicItem item) {
       throw new UnsupportedOperationException(NOT_VALID);
     }
+
+    @Override
+    public IMapKey asMapKey() {
+      throw new UnsupportedOperationException(NOT_VALID);
+    }
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNs.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNs.java
index adb7675f2..ce72f12db 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNs.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNs.java
@@ -1,57 +1,57 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.annotations;
-
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Used to identify the XML namespace to use for a set of annotated Java
- * classes.
- */
-@Retention(RUNTIME)
-@Target(ANNOTATION_TYPE)
-public @interface XmlNs {
-  /**
-   * Suggests a namespace prefix to use for generated code.
-   * <p>
-   * If the value is "##none", then there is no prefix defined.
-   *
-   * @return the associated namespace prefix
-   */
-  String prefix() default "##none";
-
-  /**
-   * Defines the Namespace URI for this namespace.
-   *
-   * @return the associated namespace
-   */
-  String namespace();
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.model.annotations;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Used to identify the XML namespace to use for a set of annotated Java
+ * classes.
+ */
+@Retention(RUNTIME)
+@Target(ANNOTATION_TYPE)
+public @interface XmlNs {
+  /**
+   * Suggests a namespace prefix to use for generated code.
+   * <p>
+   * If the value is "##none", then there is no prefix defined.
+   *
+   * @return the associated namespace prefix
+   */
+  String prefix() default "##none";
+
+  /**
+   * Defines the Namespace URI for this namespace.
+   *
+   * @return the associated namespace
+   */
+  String namespace();
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNsForm.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNsForm.java
index 2dd4abc70..6e72bfa4c 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNsForm.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlNsForm.java
@@ -1,33 +1,33 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.annotations;
-
-public enum XmlNsForm {
-  UNQUALIFIED,
-  QUALIFIED,
-  UNSET;
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.model.annotations;
+
+public enum XmlNsForm {
+  UNQUALIFIED,
+  QUALIFIED,
+  UNSET;
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlSchema.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlSchema.java
index 5b8234bb9..415c58c9b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlSchema.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/XmlSchema.java
@@ -1,94 +1,94 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.annotations;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * This annotation provides package-level Module information.
- */
-@Retention(RUNTIME)
-@Target(PACKAGE)
-public @interface XmlSchema {
-  /**
-   * The default value of a schema location, which indicates that no schema will
-   * be associated.
-   * <p>
-   * The value "##none" was chosen because ## is not a valid sequence in
-   * xs:anyURI.
-   */
-  String NO_LOCATION = ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * Defines the XML namespace URI and prefix to use for this model. If a prefix
-   * is not provided, the XML prefix will be auto-generated.
-   *
-   * @return an array of namespace definitions
-   */
-  XmlNs[] xmlns() default {};
-
-  /**
-   * Name of the XML namespace.
-   * <p>
-   * If the value is "##none", then there is no prefix defined.
-   *
-   * @return a namespace string in the form of a URI
-   */
-  String namespace() default ModelUtil.NO_STRING_VALUE;
-
-  /**
-   * The location of the associated XML schema.
-   *
-   * @return a location string in the form of a URI
-   */
-  String xmlSchemaLocation() default NO_LOCATION;
-
-  /**
-   * The location of the associated JSON schema.
-   *
-   * @return a location string in the form of a URI
-   */
-  String jsonSchemaLocation() default NO_LOCATION;
-
-  /**
-   * Get the default XML element form.
-   *
-   * @return the XML element form
-   */
-  XmlNsForm xmlElementFormDefault() default XmlNsForm.UNSET;
-
-  /**
-   * Get the default XML attribute form.
-   *
-   * @return the XML attribute form
-   */
-  XmlNsForm xmlAttributeFormDefault() default XmlNsForm.UNSET;
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.model.annotations;
+
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation provides package-level Module information.
+ */
+@Retention(RUNTIME)
+@Target(PACKAGE)
+public @interface XmlSchema {
+  /**
+   * The default value of a schema location, which indicates that no schema will
+   * be associated.
+   * <p>
+   * The value "##none" was chosen because ## is not a valid sequence in
+   * xs:anyURI.
+   */
+  String NO_LOCATION = ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * Defines the XML namespace URI and prefix to use for this model. If a prefix
+   * is not provided, the XML prefix will be auto-generated.
+   *
+   * @return an array of namespace definitions
+   */
+  XmlNs[] xmlns() default {};
+
+  /**
+   * Name of the XML namespace.
+   * <p>
+   * If the value is "##none", then there is no prefix defined.
+   *
+   * @return a namespace string in the form of a URI
+   */
+  String namespace() default ModelUtil.NO_STRING_VALUE;
+
+  /**
+   * The location of the associated XML schema.
+   *
+   * @return a location string in the form of a URI
+   */
+  String xmlSchemaLocation() default NO_LOCATION;
+
+  /**
+   * The location of the associated JSON schema.
+   *
+   * @return a location string in the form of a URI
+   */
+  String jsonSchemaLocation() default NO_LOCATION;
+
+  /**
+   * Get the default XML element form.
+   *
+   * @return the XML element form
+   */
+  XmlNsForm xmlElementFormDefault() default XmlNsForm.UNSET;
+
+  /**
+   * Get the default XML attribute form.
+   *
+   * @return the XML attribute form
+   */
+  XmlNsForm xmlAttributeFormDefault() default XmlNsForm.UNSET;
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Any.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Any.java
similarity index 78%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Any.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Any.java
index 981f33c8d..48fdd769c 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Any.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Any.java
@@ -24,20 +24,38 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
-import java.lang.Override;
-import java.lang.String;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-@SuppressWarnings("PMD.ShortClassName")
+@SuppressWarnings({
+    "PMD.ShortClassName",
+    "PMD.FieldNamingConventions" })
 @MetaschemaAssembly(
     formalName = "Any Additional Content",
     name = "any",
     moduleClass = MetaschemaModelModule.class)
-public class Any {
+public final class Any implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
+  public Any() {
+    this(null);
+  }
+
+  public Any(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String toString() {
     return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyConstraints.java
similarity index 89%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyConstraints.java
index 47cf9db51..3675ae56d 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyConstraints.java
@@ -24,8 +24,9 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly;
@@ -50,12 +51,14 @@
 @MetaschemaAssembly(
     name = "assembly-constraints",
     moduleClass = MetaschemaModelModule.class)
-public class AssemblyConstraints implements IModelConstraintsBase {
+public final class AssemblyConstraints implements IModelConstraintsBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundAssembly(
       formalName = "Constraint Let Expression",
       useName = "let",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "lets", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "lets", inJson = JsonGroupAsBehavior.LIST))
   private List<ConstraintLetExpression> _lets;
 
   @BoundChoiceGroup(
@@ -77,9 +80,22 @@ public class AssemblyConstraints implements IModelConstraintsBase {
           @BoundGroupedAssembly(formalName = "Targeted Cardinality Constraint", useName = "has-cardinality",
               binding = TargetedHasCardinalityConstraint.class)
       },
-      groupAs = @GroupAs(name = "rules", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "rules", inJson = JsonGroupAsBehavior.LIST))
   private List<? extends ITargetedConstraintBase> _rules;
 
+  public AssemblyConstraints() {
+    this(null);
+  }
+
+  public AssemblyConstraints(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public List<ConstraintLetExpression> getLets() {
     return _lets;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyModel.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyModel.java
similarity index 88%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyModel.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyModel.java
index c1f4df539..b5adcfdb2 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyModel.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyModel.java
@@ -24,7 +24,7 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter;
@@ -32,6 +32,8 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -42,6 +44,8 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly;
+import gov.nist.secauto.metaschema.databind.model.annotations.Expect;
+import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.Matches;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints;
@@ -62,7 +66,9 @@
 @MetaschemaAssembly(
     name = "assembly-model",
     moduleClass = MetaschemaModelModule.class)
-public class AssemblyModel {
+public class AssemblyModel implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundChoiceGroup(
       maxOccurs = -1,
       assemblies = {
@@ -76,8 +82,7 @@ public class AssemblyModel {
           @BoundGroupedAssembly(formalName = "Choice", useName = "choice", binding = Choice.class),
           @BoundGroupedAssembly(formalName = "Choice Grouping", useName = "choice-group", binding = ChoiceGroup.class)
       },
-      groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "instances",
-          namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "instances", inJson = JsonGroupAsBehavior.LIST))
   private List<Object> _instances;
 
   @BoundAssembly(
@@ -85,6 +90,19 @@ public class AssemblyModel {
       useName = "any")
   private Any _any;
 
+  public AssemblyModel() {
+    this(null);
+  }
+
+  public AssemblyModel(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public List<Object> getInstances() {
     return _instances;
   }
@@ -106,11 +124,75 @@ public String toString() {
     return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
   }
 
+  @MetaschemaAssembly(
+      formalName = "Choice",
+      name = "choice",
+      moduleClass = MetaschemaModelModule.class)
+  public static final class Choice implements IBoundObject {
+    private final IMetaschemaData __metaschemaData;
+
+    @BoundChoiceGroup(
+        minOccurs = 1,
+        maxOccurs = -1,
+        assemblies = {
+            @BoundGroupedAssembly(formalName = "Assembly Reference", useName = "assembly",
+                binding = AssemblyReference.class),
+            @BoundGroupedAssembly(formalName = "Inline Assembly Definition", useName = "define-assembly",
+                binding = InlineDefineAssembly.class),
+            @BoundGroupedAssembly(formalName = "Field Reference", useName = "field", binding = FieldReference.class),
+            @BoundGroupedAssembly(formalName = "Inline Field Definition", useName = "define-field",
+                binding = InlineDefineField.class)
+        },
+        groupAs = @GroupAs(name = "choices", inJson = JsonGroupAsBehavior.LIST))
+    private List<Object> _choices;
+
+    @BoundAssembly(
+        formalName = "Any Additional Content",
+        useName = "any")
+    private Any _any;
+
+    public Choice() {
+      this(null);
+    }
+
+    public Choice(IMetaschemaData data) {
+      this.__metaschemaData = data;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return __metaschemaData;
+    }
+
+    public List<Object> getChoices() {
+      return _choices;
+    }
+
+    public void setChoices(List<Object> value) {
+      _choices = value;
+    }
+
+    public Any getAny() {
+      return _any;
+    }
+
+    public void setAny(Any value) {
+      _any = value;
+    }
+
+    @Override
+    public String toString() {
+      return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
+    }
+  }
+
   @MetaschemaAssembly(
       formalName = "Choice Grouping",
       name = "choice-group",
       moduleClass = MetaschemaModelModule.class)
-  public static class ChoiceGroup {
+  public static final class ChoiceGroup implements IBoundObject {
+    private final IMetaschemaData __metaschemaData;
+
     @BoundFlag(
         formalName = "Minimum Occurrence",
         name = "min-occurs",
@@ -137,7 +219,7 @@ public static class ChoiceGroup {
         formalName = "Group As",
         useName = "group-as",
         minOccurs = 1)
-    private GroupAs _groupAs;
+    private GroupingAs _groupAs;
 
     @BoundField(
         formalName = "Discriminator JSON Property",
@@ -158,8 +240,7 @@ public static class ChoiceGroup {
             @BoundGroupedAssembly(formalName = "Inline Field Definition", useName = "define-field",
                 binding = DefineField.class)
         },
-        groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "choices",
-            namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+        groupAs = @GroupAs(name = "choices", inJson = JsonGroupAsBehavior.LIST))
     private List<Object> _choices;
 
     @BoundField(
@@ -168,6 +249,19 @@ public static class ChoiceGroup {
         useName = "remarks")
     private Remarks _remarks;
 
+    public ChoiceGroup() {
+      this(null);
+    }
+
+    public ChoiceGroup(IMetaschemaData data) {
+      this.__metaschemaData = data;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return __metaschemaData;
+    }
+
     public BigInteger getMinOccurs() {
       return _minOccurs;
     }
@@ -192,11 +286,11 @@ public void setJsonKey(JsonKey value) {
       _jsonKey = value;
     }
 
-    public GroupAs getGroupAs() {
+    public GroupingAs getGroupAs() {
       return _groupAs;
     }
 
-    public void setGroupAs(GroupAs value) {
+    public void setGroupAs(GroupingAs value) {
       _groupAs = value;
     }
 
@@ -233,7 +327,9 @@ public String toString() {
         formalName = "Grouping Assembly Reference",
         name = "assembly",
         moduleClass = MetaschemaModelModule.class)
-    public static class Assembly {
+    public static final class Assembly implements IBoundObject {
+      private final IMetaschemaData __metaschemaData;
+
       @BoundFlag(
           formalName = "Global Assembly Reference",
           name = "ref",
@@ -270,8 +366,7 @@ public static class Assembly {
           formalName = "Property",
           useName = "prop",
           maxOccurs = -1,
-          groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "props",
-              namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+          groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
       private List<Property> _props;
 
       @BoundField(
@@ -292,6 +387,19 @@ public static class Assembly {
           useName = "remarks")
       private Remarks _remarks;
 
+      public Assembly() {
+        this(null);
+      }
+
+      public Assembly(IMetaschemaData data) {
+        this.__metaschemaData = data;
+      }
+
+      @Override
+      public IMetaschemaData getMetaschemaData() {
+        return __metaschemaData;
+      }
+
       public String getRef() {
         return _ref;
       }
@@ -402,12 +510,17 @@ public String toString() {
         formalName = "Inline Assembly Definition",
         name = "define-assembly",
         moduleClass = MetaschemaModelModule.class)
-    public static class DefineAssembly {
+    public static final class DefineAssembly implements IBoundObject {
+      private final IMetaschemaData __metaschemaData;
+
       @BoundFlag(
           formalName = "Inline Assembly Name",
           name = "name",
           required = true,
-          typeAdapter = TokenAdapter.class)
+          typeAdapter = TokenAdapter.class,
+          valueConstraints = @ValueConstraints(
+              expect = @Expect(level = IConstraint.Level.WARNING, test = "not(.=$keywords)",
+                  message = "Names cannot be non-delimiting terminal symbols in Metapath syntax.")))
       private String _name;
 
       @BoundFlag(
@@ -439,8 +552,7 @@ public static class DefineAssembly {
           formalName = "Property",
           useName = "prop",
           maxOccurs = -1,
-          groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "props",
-              namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+          groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
       private List<Property> _props;
 
       @BoundField(
@@ -456,8 +568,7 @@ public static class DefineAssembly {
                   binding = InlineDefineFlag.class),
               @BoundGroupedAssembly(formalName = "Flag Reference", useName = "flag", binding = FlagReference.class)
           },
-          groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "flags",
-              namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+          groupAs = @GroupAs(name = "flags", inJson = JsonGroupAsBehavior.LIST))
       private List<Object> _flags;
 
       @BoundAssembly(
@@ -478,10 +589,22 @@ public static class DefineAssembly {
           formalName = "Example",
           useName = "example",
           maxOccurs = -1,
-          groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "examples",
-              namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+          groupAs = @GroupAs(name = "examples", inJson = JsonGroupAsBehavior.LIST))
       private List<Example> _examples;
 
+      public DefineAssembly() {
+        this(null);
+      }
+
+      public DefineAssembly(IMetaschemaData data) {
+        this.__metaschemaData = data;
+      }
+
+      @Override
+      public IMetaschemaData getMetaschemaData() {
+        return __metaschemaData;
+      }
+
       public String getName() {
         return _name;
       }
@@ -644,7 +767,9 @@ public String toString() {
         formalName = "Grouping Field Reference",
         name = "field",
         moduleClass = MetaschemaModelModule.class)
-    public static class Field {
+    public static final class Field implements IBoundObject {
+      private final IMetaschemaData __metaschemaData;
+
       @BoundFlag(
           formalName = "Global Field Reference",
           name = "ref",
@@ -700,8 +825,7 @@ public static class Field {
           formalName = "Property",
           useName = "prop",
           maxOccurs = -1,
-          groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "props",
-              namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+          groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
       private List<Property> _props;
 
       @BoundField(
@@ -722,6 +846,19 @@ public static class Field {
           useName = "remarks")
       private Remarks _remarks;
 
+      public Field() {
+        this(null);
+      }
+
+      public Field(IMetaschemaData data) {
+        this.__metaschemaData = data;
+      }
+
+      @Override
+      public IMetaschemaData getMetaschemaData() {
+        return __metaschemaData;
+      }
+
       public String getRef() {
         return _ref;
       }
@@ -848,12 +985,17 @@ public String toString() {
         formalName = "Inline Field Definition",
         name = "define-field",
         moduleClass = MetaschemaModelModule.class)
-    public static class DefineField {
+    public static final class DefineField implements IBoundObject {
+      private final IMetaschemaData __metaschemaData;
+
       @BoundFlag(
           formalName = "Inline Field Name",
           name = "name",
           required = true,
-          typeAdapter = TokenAdapter.class)
+          typeAdapter = TokenAdapter.class,
+          valueConstraints = @ValueConstraints(
+              expect = @Expect(level = IConstraint.Level.WARNING, test = "not(.=$keywords)",
+                  message = "Names cannot be non-delimiting terminal symbols in Metapath syntax.")))
       private String _name;
 
       @BoundFlag(
@@ -919,8 +1061,7 @@ public static class DefineField {
           formalName = "Property",
           useName = "prop",
           maxOccurs = -1,
-          groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "props",
-              namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+          groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
       private List<Property> _props;
 
       @BoundField(
@@ -947,8 +1088,7 @@ public static class DefineField {
                   binding = InlineDefineFlag.class),
               @BoundGroupedAssembly(formalName = "Flag Reference", useName = "flag", binding = FlagReference.class)
           },
-          groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "flags",
-              namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+          groupAs = @GroupAs(name = "flags", inJson = JsonGroupAsBehavior.LIST))
       private List<Object> _flags;
 
       @BoundAssembly(
@@ -965,10 +1105,22 @@ public static class DefineField {
           formalName = "Example",
           useName = "example",
           maxOccurs = -1,
-          groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "examples",
-              namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+          groupAs = @GroupAs(name = "examples", inJson = JsonGroupAsBehavior.LIST))
       private List<Example> _examples;
 
+      public DefineField() {
+        this(null);
+      }
+
+      public DefineField(IMetaschemaData data) {
+        this.__metaschemaData = data;
+      }
+
+      @Override
+      public IMetaschemaData getMetaschemaData() {
+        return __metaschemaData;
+      }
+
       public String getName() {
         return _name;
       }
@@ -1151,52 +1303,4 @@ public String toString() {
       }
     }
   }
-
-  @MetaschemaAssembly(
-      formalName = "Choice",
-      name = "choice",
-      moduleClass = MetaschemaModelModule.class)
-  public static class Choice {
-    @BoundChoiceGroup(
-        minOccurs = 1,
-        maxOccurs = -1,
-        assemblies = {
-            @BoundGroupedAssembly(formalName = "Assembly Reference", useName = "assembly",
-                binding = AssemblyReference.class),
-            @BoundGroupedAssembly(formalName = "Inline Assembly Definition", useName = "define-assembly",
-                binding = InlineDefineAssembly.class),
-            @BoundGroupedAssembly(formalName = "Field Reference", useName = "field", binding = FieldReference.class),
-            @BoundGroupedAssembly(formalName = "Inline Field Definition", useName = "define-field",
-                binding = InlineDefineField.class)
-        },
-        groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "choices",
-            namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
-    private List<Object> _choices;
-
-    @BoundAssembly(
-        formalName = "Any Additional Content",
-        useName = "any")
-    private Any _any;
-
-    public List<Object> getChoices() {
-      return _choices;
-    }
-
-    public void setChoices(List<Object> value) {
-      _choices = value;
-    }
-
-    public Any getAny() {
-      return _any;
-    }
-
-    public void setAny(Any value) {
-      _any = value;
-    }
-
-    @Override
-    public String toString() {
-      return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
-    }
-  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyReference.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyReference.java
similarity index 90%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyReference.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyReference.java
index 5b1acc190..b7418ab62 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/AssemblyReference.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyReference.java
@@ -24,7 +24,7 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter;
@@ -32,22 +32,25 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
+import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.Matches;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints;
-import java.lang.Override;
-import java.lang.String;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.math.BigInteger;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 @SuppressWarnings({
     "PMD.DataClass",
@@ -57,7 +60,9 @@
     formalName = "Assembly Reference",
     name = "assembly-reference",
     moduleClass = MetaschemaModelModule.class)
-public class AssemblyReference {
+public final class AssemblyReference implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Global Assembly Reference",
       name = "ref",
@@ -110,8 +115,7 @@ public class AssemblyReference {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "props", namespace = "##default",
-          inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundField(
@@ -123,7 +127,7 @@ public class AssemblyReference {
   @BoundAssembly(
       formalName = "Group As",
       useName = "group-as")
-  private GroupAs _groupAs;
+  private GroupingAs _groupAs;
 
   @BoundField(
       formalName = "Remarks",
@@ -131,6 +135,19 @@ public class AssemblyReference {
       useName = "remarks")
   private Remarks _remarks;
 
+  public AssemblyReference() {
+    this(null);
+  }
+
+  public AssemblyReference(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getRef() {
     return _ref;
   }
@@ -231,11 +248,11 @@ public void setUseName(UseName value) {
     _useName = value;
   }
 
-  public GroupAs getGroupAs() {
+  public GroupingAs getGroupAs() {
     return _groupAs;
   }
 
-  public void setGroupAs(GroupAs value) {
+  public void setGroupAs(GroupingAs value) {
     _groupAs = value;
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/ConstraintLetExpression.java
similarity index 86%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/ConstraintLetExpression.java
index b003a8f0d..dcdacaf08 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/ConstraintLetExpression.java
@@ -24,15 +24,16 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
-import java.lang.Override;
-import java.lang.String;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -44,7 +45,9 @@
     formalName = "Constraint Let Expression",
     name = "constraint-let-expression",
     moduleClass = MetaschemaModelModule.class)
-public class ConstraintLetExpression {
+public final class ConstraintLetExpression implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Let Variable Name",
       name = "var",
@@ -65,6 +68,19 @@ public class ConstraintLetExpression {
       useName = "remarks")
   private Remarks _remarks;
 
+  public ConstraintLetExpression() {
+    this(null);
+  }
+
+  public ConstraintLetExpression(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getVar() {
     return _var;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/ConstraintValueEnum.java
similarity index 86%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/ConstraintValueEnum.java
index fdc41079e..74ef8a33f 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/ConstraintValueEnum.java
@@ -24,11 +24,13 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField;
@@ -46,8 +48,11 @@
     formalName = "Allowed Value Enumeration",
     name = "constraint-value-enum",
     moduleClass = MetaschemaModelModule.class)
-public class ConstraintValueEnum
-    extends AbstractAllowedValue {
+public final class ConstraintValueEnum
+    extends AbstractAllowedValue
+    implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Allowed Value Enumeration Value",
       name = "value",
@@ -66,6 +71,19 @@ public class ConstraintValueEnum
       typeAdapter = MarkupLineAdapter.class)
   private MarkupLine _remark;
 
+  public ConstraintValueEnum() {
+    this(null);
+  }
+
+  public ConstraintValueEnum(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getValue() {
     return _value;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Example.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Example.java
similarity index 88%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Example.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Example.java
index 0d5c9567e..803d07c3f 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Example.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Example.java
@@ -24,21 +24,23 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
-import java.lang.Override;
-import java.lang.String;
-import java.net.URI;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.net.URI;
+
 @SuppressWarnings({
     "PMD.DataClass",
     "PMD.FieldNamingConventions"
@@ -47,7 +49,9 @@
     formalName = "Example",
     name = "example",
     moduleClass = MetaschemaModelModule.class)
-public class Example {
+public final class Example implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Example Reference",
       name = "ref",
@@ -71,6 +75,19 @@ public class Example {
       useName = "remarks")
   private Remarks _remarks;
 
+  public Example() {
+    this(null);
+  }
+
+  public Example(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public URI getRef() {
     return _ref;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldConstraints.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FieldConstraints.java
similarity index 83%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldConstraints.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FieldConstraints.java
index 469a616e9..bb0aa6764 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldConstraints.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FieldConstraints.java
@@ -24,8 +24,9 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly;
@@ -33,8 +34,8 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IValueConstraintsBase;
+import gov.nist.secauto.metaschema.databind.model.metaschema.ITargetedConstraintBase;
+import gov.nist.secauto.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -49,12 +50,14 @@
 @MetaschemaAssembly(
     name = "field-constraints",
     moduleClass = MetaschemaModelModule.class)
-public class FieldConstraints implements IValueConstraintsBase {
+public final class FieldConstraints implements IValueTargetedConstraintsBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundAssembly(
       formalName = "Constraint Let Expression",
       useName = "let",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "lets", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "lets", inJson = JsonGroupAsBehavior.LIST))
   private List<ConstraintLetExpression> _lets;
 
   @BoundChoiceGroup(
@@ -70,8 +73,21 @@ public class FieldConstraints implements IValueConstraintsBase {
           @BoundGroupedAssembly(formalName = "Value Matches Constraint", useName = "matches",
               binding = TargetedMatchesConstraint.class)
       },
-      groupAs = @GroupAs(name = "rules", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
-  private List<? extends IConstraintBase> _rules;
+      groupAs = @GroupAs(name = "rules", inJson = JsonGroupAsBehavior.LIST))
+  private List<? extends ITargetedConstraintBase> _rules;
+
+  public FieldConstraints() {
+    this(null);
+  }
+
+  public FieldConstraints(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
 
   @Override
   public List<ConstraintLetExpression> getLets() {
@@ -111,11 +127,11 @@ public boolean removeLet(ConstraintLetExpression item) {
   }
 
   @Override
-  public List<? extends IConstraintBase> getRules() {
+  public List<? extends ITargetedConstraintBase> getRules() {
     return _rules;
   }
 
-  public void setRules(List<? extends IConstraintBase> value) {
+  public void setRules(List<? extends ITargetedConstraintBase> value) {
     _rules = value;
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldReference.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FieldReference.java
similarity index 91%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldReference.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FieldReference.java
index 0cbff61d7..2580a5c97 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FieldReference.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FieldReference.java
@@ -24,7 +24,7 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter;
@@ -32,6 +32,8 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -40,16 +42,17 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
+import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.Matches;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints;
-import java.lang.Override;
-import java.lang.String;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.math.BigInteger;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 @SuppressWarnings({
     "PMD.DataClass",
@@ -59,7 +62,9 @@
     formalName = "Field Reference",
     name = "field-reference",
     moduleClass = MetaschemaModelModule.class)
-public class FieldReference {
+public final class FieldReference implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Global Field Reference",
       name = "ref",
@@ -131,8 +136,7 @@ public class FieldReference {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "props", namespace = "##default",
-          inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundField(
@@ -144,7 +148,7 @@ public class FieldReference {
   @BoundAssembly(
       formalName = "Group As",
       useName = "group-as")
-  private GroupAs _groupAs;
+  private GroupingAs _groupAs;
 
   @BoundField(
       formalName = "Remarks",
@@ -152,6 +156,19 @@ public class FieldReference {
       useName = "remarks")
   private Remarks _remarks;
 
+  public FieldReference() {
+    this(null);
+  }
+
+  public FieldReference(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getRef() {
     return _ref;
   }
@@ -268,11 +285,11 @@ public void setUseName(UseName value) {
     _useName = value;
   }
 
-  public GroupAs getGroupAs() {
+  public GroupingAs getGroupAs() {
     return _groupAs;
   }
 
-  public void setGroupAs(GroupAs value) {
+  public void setGroupAs(GroupingAs value) {
     _groupAs = value;
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagAllowedValues.java
similarity index 90%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagAllowedValues.java
index c1091c614..86ff5aeea 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagAllowedValues.java
@@ -24,11 +24,13 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -56,7 +58,9 @@
     formalName = "Allowed Values Constraint",
     name = "flag-allowed-values",
     moduleClass = MetaschemaModelModule.class)
-public class FlagAllowedValues implements IConstraintBase {
+public final class FlagAllowedValues implements IBoundObject, IConstraintBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Constraint Identifier",
       name = "id",
@@ -76,7 +80,9 @@ public class FlagAllowedValues implements IConstraintBase {
           @AllowedValue(value = "WARNING",
               description = "A violation of the constraint represents a potential issue with the content."),
           @AllowedValue(value = "INFORMATIONAL",
-              description = "A violation of the constraint represents a point of interest.") })))
+              description = "A violation of the constraint represents a point of interest."),
+          @AllowedValue(value = "DEBUG",
+              description = "A violation of the constraint represents a fault in the content that may warrant review by a developer when performing model or tool development.") })))
   private String _level;
 
   @BoundFlag(
@@ -122,7 +128,7 @@ public class FlagAllowedValues implements IConstraintBase {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundField(
@@ -130,7 +136,7 @@ public class FlagAllowedValues implements IConstraintBase {
       useName = "enum",
       minOccurs = 1,
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "enums", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "enums", inJson = JsonGroupAsBehavior.LIST))
   private List<ConstraintValueEnum> _enums;
 
   @BoundField(
@@ -139,6 +145,19 @@ public class FlagAllowedValues implements IConstraintBase {
       useName = "remarks")
   private Remarks _remarks;
 
+  public FlagAllowedValues() {
+    this(null);
+  }
+
+  public FlagAllowedValues(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getId() {
     return _id;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagConstraints.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagConstraints.java
similarity index 88%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagConstraints.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagConstraints.java
index 6f6db71a9..01a067c43 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagConstraints.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagConstraints.java
@@ -24,8 +24,9 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly;
@@ -50,12 +51,14 @@
 @MetaschemaAssembly(
     name = "flag-constraints",
     moduleClass = MetaschemaModelModule.class)
-public class FlagConstraints implements IValueConstraintsBase {
+public final class FlagConstraints implements IValueConstraintsBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundAssembly(
       formalName = "Constraint Let Expression",
       useName = "let",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "lets", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "lets", inJson = JsonGroupAsBehavior.LIST))
   private List<ConstraintLetExpression> _lets;
 
   @BoundChoiceGroup(
@@ -71,9 +74,22 @@ public class FlagConstraints implements IValueConstraintsBase {
           @BoundGroupedAssembly(formalName = "Value Matches Constraint", useName = "matches",
               binding = FlagMatches.class)
       },
-      groupAs = @GroupAs(name = "rules", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "rules", inJson = JsonGroupAsBehavior.LIST))
   private List<? extends IConstraintBase> _rules;
 
+  public FlagConstraints() {
+    this(null);
+  }
+
+  public FlagConstraints(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public List<ConstraintLetExpression> getLets() {
     return _lets;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagExpect.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagExpect.java
similarity index 89%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagExpect.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagExpect.java
index f609191c7..2aac6157b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagExpect.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagExpect.java
@@ -24,12 +24,14 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -57,7 +59,9 @@
     formalName = "Expect Condition Constraint",
     name = "flag-expect",
     moduleClass = MetaschemaModelModule.class)
-public class FlagExpect implements IConstraintBase {
+public final class FlagExpect implements IBoundObject, IConstraintBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Constraint Identifier",
       name = "id",
@@ -77,7 +81,9 @@ public class FlagExpect implements IConstraintBase {
           @AllowedValue(value = "WARNING",
               description = "A violation of the constraint represents a potential issue with the content."),
           @AllowedValue(value = "INFORMATIONAL",
-              description = "A violation of the constraint represents a point of interest.") })))
+              description = "A violation of the constraint represents a point of interest."),
+          @AllowedValue(value = "DEBUG",
+              description = "A violation of the constraint represents a fault in the content that may warrant review by a developer when performing model or tool development.") })))
   private String _level;
 
   @BoundFlag(
@@ -104,7 +110,7 @@ public class FlagExpect implements IConstraintBase {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundField(
@@ -118,6 +124,19 @@ public class FlagExpect implements IConstraintBase {
       useName = "remarks")
   private Remarks _remarks;
 
+  public FlagExpect() {
+    this(null);
+  }
+
+  public FlagExpect(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getId() {
     return _id;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagIndexHasKey.java
similarity index 89%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagIndexHasKey.java
index 53fb36ed1..6fc58fa21 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagIndexHasKey.java
@@ -24,11 +24,13 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -56,7 +58,9 @@
     formalName = "Index Has Key Constraint",
     name = "flag-index-has-key",
     moduleClass = MetaschemaModelModule.class)
-public class FlagIndexHasKey implements IConstraintBase {
+public final class FlagIndexHasKey implements IBoundObject, IConstraintBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Constraint Identifier",
       name = "id",
@@ -76,7 +80,9 @@ public class FlagIndexHasKey implements IConstraintBase {
           @AllowedValue(value = "WARNING",
               description = "A violation of the constraint represents a potential issue with the content."),
           @AllowedValue(value = "INFORMATIONAL",
-              description = "A violation of the constraint represents a point of interest.") })))
+              description = "A violation of the constraint represents a point of interest."),
+          @AllowedValue(value = "DEBUG",
+              description = "A violation of the constraint represents a fault in the content that may warrant review by a developer when performing model or tool development.") })))
   private String _level;
 
   @BoundFlag(
@@ -103,7 +109,7 @@ public class FlagIndexHasKey implements IConstraintBase {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundAssembly(
@@ -111,7 +117,7 @@ public class FlagIndexHasKey implements IConstraintBase {
       useName = "key-field",
       minOccurs = 1,
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "key-fields", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "key-fields", inJson = JsonGroupAsBehavior.LIST))
   private List<KeyConstraintField> _keyFields;
 
   @BoundField(
@@ -120,6 +126,19 @@ public class FlagIndexHasKey implements IConstraintBase {
       useName = "remarks")
   private Remarks _remarks;
 
+  public FlagIndexHasKey() {
+    this(null);
+  }
+
+  public FlagIndexHasKey(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getId() {
     return _id;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagMatches.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagMatches.java
similarity index 91%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagMatches.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagMatches.java
index dedba477e..b42962021 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagMatches.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagMatches.java
@@ -24,12 +24,14 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -57,7 +59,9 @@
     formalName = "Value Matches Constraint",
     name = "flag-matches",
     moduleClass = MetaschemaModelModule.class)
-public class FlagMatches implements IConstraintBase {
+public final class FlagMatches implements IBoundObject, IConstraintBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Constraint Identifier",
       name = "id",
@@ -77,7 +81,9 @@ public class FlagMatches implements IConstraintBase {
           @AllowedValue(value = "WARNING",
               description = "A violation of the constraint represents a potential issue with the content."),
           @AllowedValue(value = "INFORMATIONAL",
-              description = "A violation of the constraint represents a point of interest.") })))
+              description = "A violation of the constraint represents a point of interest."),
+          @AllowedValue(value = "DEBUG",
+              description = "A violation of the constraint represents a fault in the content that may warrant review by a developer when performing model or tool development.") })))
   private String _level;
 
   @BoundFlag(
@@ -127,7 +133,7 @@ public class FlagMatches implements IConstraintBase {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundField(
@@ -136,6 +142,19 @@ public class FlagMatches implements IConstraintBase {
       useName = "remarks")
   private Remarks _remarks;
 
+  public FlagMatches() {
+    this(null);
+  }
+
+  public FlagMatches(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getId() {
     return _id;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagReference.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagReference.java
similarity index 92%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagReference.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagReference.java
index 3ccb2dc49..467ee737b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/FlagReference.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagReference.java
@@ -24,13 +24,15 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -42,13 +44,13 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints;
-import java.lang.Override;
-import java.lang.String;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.math.BigInteger;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 @SuppressWarnings({
     "PMD.DataClass",
@@ -58,7 +60,9 @@
     formalName = "Flag Reference",
     name = "flag-reference",
     moduleClass = MetaschemaModelModule.class)
-public class FlagReference {
+public final class FlagReference implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Global Flag Reference",
       name = "ref",
@@ -110,7 +114,7 @@ public class FlagReference {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundField(
@@ -125,6 +129,19 @@ public class FlagReference {
       useName = "remarks")
   private Remarks _remarks;
 
+  public FlagReference() {
+    this(null);
+  }
+
+  public FlagReference(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getRef() {
     return _ref;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/GroupAs.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/GroupingAs.java
similarity index 89%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/GroupAs.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/GroupingAs.java
index 5ed6ed33f..9c0c78347 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/GroupAs.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/GroupingAs.java
@@ -24,17 +24,18 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue;
 import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints;
-import java.lang.Override;
-import java.lang.String;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -46,7 +47,9 @@
     formalName = "Group As",
     name = "group-as",
     moduleClass = MetaschemaModelModule.class)
-public class GroupAs {
+public final class GroupingAs implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Grouping Name",
       name = "name",
@@ -77,6 +80,19 @@ public class GroupAs {
               @AllowedValue(value = "UNGROUPED", description = "Do not use a wrapper element.") })))
   private String _inXml;
 
+  public GroupingAs() {
+    this(null);
+  }
+
+  public GroupingAs(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getName() {
     return _name;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/InlineDefineAssembly.java
similarity index 88%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/InlineDefineAssembly.java
index 8be25ca5f..4cfdb0f22 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/InlineDefineAssembly.java
@@ -24,7 +24,7 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter;
@@ -32,6 +32,8 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -40,17 +42,18 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly;
+import gov.nist.secauto.metaschema.databind.model.annotations.Expect;
+import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.Matches;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.math.BigInteger;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 @SuppressWarnings({
     "PMD.DataClass",
@@ -60,12 +63,16 @@
     formalName = "Inline Assembly Definition",
     name = "inline-define-assembly",
     moduleClass = MetaschemaModelModule.class)
-public class InlineDefineAssembly {
+public final class InlineDefineAssembly implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Inline Assembly Name",
       name = "name",
       required = true,
-      typeAdapter = TokenAdapter.class)
+      typeAdapter = TokenAdapter.class,
+      valueConstraints = @ValueConstraints(expect = @Expect(level = IConstraint.Level.WARNING,
+          test = "not(.=$keywords)", message = "Names cannot be non-delimiting terminal symbols in Metapath syntax.")))
   private String _name;
 
   @BoundFlag(
@@ -113,8 +120,7 @@ public class InlineDefineAssembly {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "props", namespace = "##default",
-          inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundAssembly(
@@ -126,7 +132,7 @@ public class InlineDefineAssembly {
   @BoundAssembly(
       formalName = "Group As",
       useName = "group-as")
-  private GroupAs _groupAs;
+  private GroupingAs _groupAs;
 
   @BoundChoiceGroup(
       maxOccurs = -1,
@@ -135,8 +141,7 @@ public class InlineDefineAssembly {
               binding = InlineDefineFlag.class),
           @BoundGroupedAssembly(formalName = "Flag Reference", useName = "flag", binding = FlagReference.class)
       },
-      groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "flags", namespace = "##default",
-          inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "flags", inJson = JsonGroupAsBehavior.LIST))
   private List<Object> _flags;
 
   @BoundAssembly(
@@ -157,10 +162,22 @@ public class InlineDefineAssembly {
       formalName = "Example",
       useName = "example",
       maxOccurs = -1,
-      groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "examples",
-          namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "examples", inJson = JsonGroupAsBehavior.LIST))
   private List<Example> _examples;
 
+  public InlineDefineAssembly() {
+    this(null);
+  }
+
+  public InlineDefineAssembly(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getName() {
     return _name;
   }
@@ -261,11 +278,11 @@ public void setJsonKey(JsonKey value) {
     _jsonKey = value;
   }
 
-  public GroupAs getGroupAs() {
+  public GroupingAs getGroupAs() {
     return _groupAs;
   }
 
-  public void setGroupAs(GroupAs value) {
+  public void setGroupAs(GroupingAs value) {
     _groupAs = value;
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/InlineDefineField.java
similarity index 91%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineField.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/InlineDefineField.java
index 5ed0f442d..35662ed05 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineField.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/InlineDefineField.java
@@ -24,7 +24,7 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter;
@@ -32,6 +32,8 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -42,17 +44,18 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly;
+import gov.nist.secauto.metaschema.databind.model.annotations.Expect;
+import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.Matches;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.math.BigInteger;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 @SuppressWarnings({
     "PMD.DataClass",
@@ -63,12 +66,16 @@
     formalName = "Inline Field Definition",
     name = "inline-define-field",
     moduleClass = MetaschemaModelModule.class)
-public class InlineDefineField {
+public final class InlineDefineField implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Inline Field Name",
       name = "name",
       required = true,
-      typeAdapter = TokenAdapter.class)
+      typeAdapter = TokenAdapter.class,
+      valueConstraints = @ValueConstraints(expect = @Expect(level = IConstraint.Level.WARNING,
+          test = "not(.=$keywords)", message = "Names cannot be non-delimiting terminal symbols in Metapath syntax.")))
   private String _name;
 
   @BoundFlag(
@@ -161,8 +168,7 @@ public class InlineDefineField {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "props", namespace = "##default",
-          inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundAssembly(
@@ -185,7 +191,7 @@ public class InlineDefineField {
   @BoundAssembly(
       formalName = "Group As",
       useName = "group-as")
-  private GroupAs _groupAs;
+  private GroupingAs _groupAs;
 
   @BoundChoiceGroup(
       maxOccurs = -1,
@@ -194,8 +200,7 @@ public class InlineDefineField {
               binding = InlineDefineFlag.class),
           @BoundGroupedAssembly(formalName = "Flag Reference", useName = "flag", binding = FlagReference.class)
       },
-      groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "flags", namespace = "##default",
-          inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "flags", inJson = JsonGroupAsBehavior.LIST))
   private List<Object> _flags;
 
   @BoundAssembly(
@@ -212,10 +217,22 @@ public class InlineDefineField {
       formalName = "Example",
       useName = "example",
       maxOccurs = -1,
-      groupAs = @gov.nist.secauto.metaschema.databind.model.annotations.GroupAs(name = "examples",
-          namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "examples", inJson = JsonGroupAsBehavior.LIST))
   private List<Example> _examples;
 
+  public InlineDefineField() {
+    this(null);
+  }
+
+  public InlineDefineField(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getName() {
     return _name;
   }
@@ -356,11 +373,11 @@ public void setJsonValueKeyFlag(JsonValueKeyFlag value) {
     _jsonValueKeyFlag = value;
   }
 
-  public GroupAs getGroupAs() {
+  public GroupingAs getGroupAs() {
     return _groupAs;
   }
 
-  public void setGroupAs(GroupAs value) {
+  public void setGroupAs(GroupingAs value) {
     _groupAs = value;
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/InlineDefineFlag.java
similarity index 90%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/InlineDefineFlag.java
index 048be4ea8..f9e7b9122 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/InlineDefineFlag.java
@@ -24,13 +24,15 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -39,16 +41,17 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
+import gov.nist.secauto.metaschema.databind.model.annotations.Expect;
 import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints;
-import java.lang.Override;
-import java.lang.String;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.math.BigInteger;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 @SuppressWarnings({
     "PMD.DataClass",
@@ -58,12 +61,16 @@
     formalName = "Inline Flag Definition",
     name = "inline-define-flag",
     moduleClass = MetaschemaModelModule.class)
-public class InlineDefineFlag {
+public final class InlineDefineFlag implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Inline Flag Name",
       name = "name",
       required = true,
-      typeAdapter = TokenAdapter.class)
+      typeAdapter = TokenAdapter.class,
+      valueConstraints = @ValueConstraints(expect = @Expect(level = IConstraint.Level.WARNING,
+          test = "not(.=$keywords)", message = "Names cannot be non-delimiting terminal symbols in Metapath syntax.")))
   private String _name;
 
   @BoundFlag(
@@ -135,7 +142,7 @@ public class InlineDefineFlag {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundAssembly(
@@ -152,9 +159,22 @@ public class InlineDefineFlag {
       formalName = "Example",
       useName = "example",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "examples", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "examples", inJson = JsonGroupAsBehavior.LIST))
   private List<Example> _examples;
 
+  public InlineDefineFlag() {
+    this(null);
+  }
+
+  public InlineDefineFlag(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getName() {
     return _name;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonKey.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/JsonKey.java
similarity index 86%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonKey.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/JsonKey.java
index fde5fee66..c66f7435e 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonKey.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/JsonKey.java
@@ -24,13 +24,14 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
-import java.lang.Override;
-import java.lang.String;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -48,7 +49,9 @@
     description = "Used in JSON (and similar formats) to identify a flag that will be used as the property name in an object hold a collection of sibling objects. Requires that siblings must never share `json-key` values.",
     name = "json-key",
     moduleClass = MetaschemaModelModule.class)
-public class JsonKey {
+public final class JsonKey implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   /**
    * "References the flag that will serve as the JSON key."
    */
@@ -60,6 +63,19 @@ public class JsonKey {
       typeAdapter = TokenAdapter.class)
   private String _flagRef;
 
+  public JsonKey() {
+    this(null);
+  }
+
+  public JsonKey(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getFlagRef() {
     return _flagRef;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/JsonValueKeyFlag.java
similarity index 83%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/JsonValueKeyFlag.java
index 639a83842..d1765ae70 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/JsonValueKeyFlag.java
@@ -24,13 +24,14 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
-import java.lang.Override;
-import java.lang.String;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -42,7 +43,9 @@
     formalName = "Flag Used as the Field Value's JSON Property Name",
     name = "json-value-key-flag",
     moduleClass = MetaschemaModelModule.class)
-public class JsonValueKeyFlag {
+public final class JsonValueKeyFlag implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Flag Reference",
       name = "flag-ref",
@@ -50,6 +53,19 @@ public class JsonValueKeyFlag {
       typeAdapter = TokenAdapter.class)
   private String _flagRef;
 
+  public JsonValueKeyFlag() {
+    this(null);
+  }
+
+  public JsonValueKeyFlag(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getFlagRef() {
     return _flagRef;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/KeyConstraintField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/KeyConstraintField.java
similarity index 86%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/KeyConstraintField.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/KeyConstraintField.java
index 7b4fd7c1a..eec58ff41 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/KeyConstraintField.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/KeyConstraintField.java
@@ -24,14 +24,15 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
-import java.lang.Override;
-import java.lang.String;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -43,7 +44,9 @@
     formalName = "Key Constraint",
     name = "key-constraint-field",
     moduleClass = MetaschemaModelModule.class)
-public class KeyConstraintField {
+public final class KeyConstraintField implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Key Field Value Target",
       name = "target",
@@ -63,6 +66,19 @@ public class KeyConstraintField {
       useName = "remarks")
   private Remarks _remarks;
 
+  public KeyConstraintField() {
+    this(null);
+  }
+
+  public KeyConstraintField(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getTarget() {
     return _target;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/METASCHEMA.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/METASCHEMA.java
similarity index 90%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/METASCHEMA.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/METASCHEMA.java
index 94f036f94..0b6d748d2 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/METASCHEMA.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/METASCHEMA.java
@@ -24,7 +24,7 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.PositiveIntegerAdapter;
@@ -34,6 +34,8 @@
 import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -45,19 +47,19 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedAssembly;
+import gov.nist.secauto.metaschema.databind.model.annotations.Expect;
 import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField;
 import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.math.BigInteger;
 import java.net.URI;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * A declaration of the Metaschema module.
@@ -75,7 +77,9 @@
     name = "METASCHEMA",
     moduleClass = MetaschemaModelModule.class,
     rootName = "METASCHEMA")
-public class METASCHEMA {
+public final class METASCHEMA implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   /**
    * "Determines if the Metaschema module is abstract (&lsquo;yes&rsquo;) or not
    * (&lsquo;no&rsquo;)."
@@ -139,7 +143,7 @@ public class METASCHEMA {
       description = "Imports a set of Metaschema modules contained in another resource. Imports support the reuse of common information structures.",
       useName = "import",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "imports", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "imports", inJson = JsonGroupAsBehavior.LIST))
   private List<Import> _imports;
 
   @BoundChoiceGroup(
@@ -153,9 +157,22 @@ public class METASCHEMA {
           @BoundGroupedAssembly(formalName = "Global Flag Definition", useName = "define-flag",
               binding = DefineFlag.class)
       },
-      groupAs = @GroupAs(name = "definitions", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "definitions", inJson = JsonGroupAsBehavior.LIST))
   private List<Object> _definitions;
 
+  public METASCHEMA() {
+    this(null);
+  }
+
+  public METASCHEMA(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getAbstract() {
     return _abstract;
   }
@@ -260,20 +277,83 @@ public String toString() {
     return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
   }
 
+  /**
+   * Imports a set of Metaschema modules contained in another resource. Imports
+   * support the reuse of common information structures.
+   */
   @MetaschemaAssembly(
-      formalName = "Global Field Definition",
-      name = "define-field",
+      formalName = "Module Import",
+      description = "Imports a set of Metaschema modules contained in another resource. Imports support the reuse of common information structures.",
+      name = "import",
       moduleClass = MetaschemaModelModule.class)
-  public static class DefineField {
+  public static final class Import implements IBoundObject {
+    private final IMetaschemaData __metaschemaData;
+
+    /**
+     * "A relative or absolute URI for retrieving an out-of-line Metaschema
+     * definition."
+     */
     @BoundFlag(
-        formalName = "Global Field Name",
+        formalName = "Import URI Reference",
+        description = "A relative or absolute URI for retrieving an out-of-line Metaschema definition.",
+        name = "href",
+        required = true,
+        typeAdapter = UriReferenceAdapter.class)
+    private URI _href;
+
+    public Import() {
+      this(null);
+    }
+
+    public Import(IMetaschemaData data) {
+      this.__metaschemaData = data;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return __metaschemaData;
+    }
+
+    public URI getHref() {
+      return _href;
+    }
+
+    public void setHref(URI value) {
+      _href = value;
+    }
+
+    @Override
+    public String toString() {
+      return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
+    }
+  }
+
+  /**
+   * In XML, an element with structured element content. In JSON, an object with
+   * properties. Defined globally, an assembly can be assigned to appear in the
+   * <code>model</code> of any assembly (another assembly type, or itself), by
+   * <code>assembly</code> reference.
+   */
+  @MetaschemaAssembly(
+      formalName = "Global Assembly Definition",
+      description = "In XML, an element with structured element content. In JSON, an object with properties. Defined globally, an assembly can be assigned to appear in the `model` of any assembly (another assembly type, or itself), by `assembly` reference.",
+      name = "define-assembly",
+      moduleClass = MetaschemaModelModule.class)
+  public static final class DefineAssembly implements IBoundObject {
+    private final IMetaschemaData __metaschemaData;
+
+    @BoundFlag(
+        formalName = "Global Assembly Name",
         name = "name",
         required = true,
-        typeAdapter = TokenAdapter.class)
+        typeAdapter = TokenAdapter.class,
+        valueConstraints = @ValueConstraints(
+            expect = @Expect(level = IConstraint.Level.WARNING, test = "not(.=$keywords)",
+                message = "Names cannot be non-delimiting terminal symbols in Metapath syntax.")))
     private String _name;
 
     @BoundFlag(
-        formalName = "Global Field Binary Name",
+        formalName = "Global Assembly Binary Name",
         name = "index",
         typeAdapter = PositiveIntegerAdapter.class)
     private BigInteger _index;
@@ -296,39 +376,6 @@ public static class DefineField {
         typeAdapter = StringAdapter.class)
     private String _deprecated;
 
-    @BoundFlag(
-        formalName = "Field Value Data Type",
-        name = "as-type",
-        defaultValue = "string",
-        typeAdapter = TokenAdapter.class,
-        valueConstraints = @ValueConstraints(allowedValues = @AllowedValues(level = IConstraint.Level.ERROR,
-            allowOthers = true,
-            values = { @AllowedValue(value = "markup-line", description = ""),
-                @AllowedValue(value = "markup-multiline", description = ""),
-                @AllowedValue(value = "base64", description = ""), @AllowedValue(value = "boolean", description = ""),
-                @AllowedValue(value = "date", description = ""), @AllowedValue(value = "date-time", description = ""),
-                @AllowedValue(value = "date-time-with-timezone", description = ""),
-                @AllowedValue(value = "date-with-timezone", description = ""),
-                @AllowedValue(value = "day-time-duration", description = ""),
-                @AllowedValue(value = "decimal", description = ""),
-                @AllowedValue(value = "email-address", description = ""),
-                @AllowedValue(value = "hostname", description = ""), @AllowedValue(value = "integer", description = ""),
-                @AllowedValue(value = "ip-v4-address", description = ""),
-                @AllowedValue(value = "ip-v6-address", description = ""),
-                @AllowedValue(value = "non-negative-integer", description = ""),
-                @AllowedValue(value = "positive-integer", description = ""),
-                @AllowedValue(value = "string", description = ""), @AllowedValue(value = "token", description = ""),
-                @AllowedValue(value = "uri", description = ""),
-                @AllowedValue(value = "uri-reference", description = ""),
-                @AllowedValue(value = "uuid", description = "") })))
-    private String _asType;
-
-    @BoundFlag(
-        formalName = "Default Field Value",
-        name = "default",
-        typeAdapter = StringAdapter.class)
-    private String _default;
-
     @BoundField(
         formalName = "Formal Name",
         description = "A formal name for the data construct, to be presented in documentation.",
@@ -346,7 +393,7 @@ public static class DefineField {
         formalName = "Property",
         useName = "prop",
         maxOccurs = -1,
-        groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+        groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
     private List<Property> _props;
 
     @BoundField(
@@ -355,23 +402,19 @@ public static class DefineField {
         useName = "use-name")
     private UseName _useName;
 
+    @BoundField(
+        formalName = "Root Name",
+        description = "Provides a root name, for when the definition is used as the root of a node hierarchy.",
+        useName = "root-name",
+        minOccurs = 1)
+    private RootName _rootName;
+
     @BoundAssembly(
         formalName = "JSON Key",
         description = "Used in JSON (and similar formats) to identify a flag that will be used as the property name in an object hold a collection of sibling objects. Requires that siblings must never share `json-key` values.",
         useName = "json-key")
     private JsonKey _jsonKey;
 
-    @BoundField(
-        formalName = "Field Value JSON Property Name",
-        useName = "json-value-key",
-        typeAdapter = TokenAdapter.class)
-    private String _jsonValueKey;
-
-    @BoundAssembly(
-        formalName = "Flag Used as the Field Value's JSON Property Name",
-        useName = "json-value-key-flag")
-    private JsonValueKeyFlag _jsonValueKeyFlag;
-
     @BoundChoiceGroup(
         maxOccurs = -1,
         assemblies = {
@@ -379,12 +422,16 @@ public static class DefineField {
                 binding = InlineDefineFlag.class),
             @BoundGroupedAssembly(formalName = "Flag Reference", useName = "flag", binding = FlagReference.class)
         },
-        groupAs = @GroupAs(name = "flags", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+        groupAs = @GroupAs(name = "flags", inJson = JsonGroupAsBehavior.LIST))
     private List<Object> _flags;
 
+    @BoundAssembly(
+        useName = "model")
+    private AssemblyModel _model;
+
     @BoundAssembly(
         useName = "constraint")
-    private FieldConstraints _constraint;
+    private AssemblyConstraints _constraint;
 
     @BoundField(
         formalName = "Remarks",
@@ -396,9 +443,22 @@ public static class DefineField {
         formalName = "Example",
         useName = "example",
         maxOccurs = -1,
-        groupAs = @GroupAs(name = "examples", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+        groupAs = @GroupAs(name = "examples", inJson = JsonGroupAsBehavior.LIST))
     private List<Example> _examples;
 
+    public DefineAssembly() {
+      this(null);
+    }
+
+    public DefineAssembly(IMetaschemaData data) {
+      this.__metaschemaData = data;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return __metaschemaData;
+    }
+
     public String getName() {
       return _name;
     }
@@ -431,22 +491,6 @@ public void setDeprecated(String value) {
       _deprecated = value;
     }
 
-    public String getAsType() {
-      return _asType;
-    }
-
-    public void setAsType(String value) {
-      _asType = value;
-    }
-
-    public String getDefault() {
-      return _default;
-    }
-
-    public void setDefault(String value) {
-      _default = value;
-    }
-
     public String getFormalName() {
       return _formalName;
     }
@@ -507,28 +551,20 @@ public void setUseName(UseName value) {
       _useName = value;
     }
 
-    public JsonKey getJsonKey() {
-      return _jsonKey;
-    }
-
-    public void setJsonKey(JsonKey value) {
-      _jsonKey = value;
-    }
-
-    public String getJsonValueKey() {
-      return _jsonValueKey;
+    public RootName getRootName() {
+      return _rootName;
     }
 
-    public void setJsonValueKey(String value) {
-      _jsonValueKey = value;
+    public void setRootName(RootName value) {
+      _rootName = value;
     }
 
-    public JsonValueKeyFlag getJsonValueKeyFlag() {
-      return _jsonValueKeyFlag;
+    public JsonKey getJsonKey() {
+      return _jsonKey;
     }
 
-    public void setJsonValueKeyFlag(JsonValueKeyFlag value) {
-      _jsonValueKeyFlag = value;
+    public void setJsonKey(JsonKey value) {
+      _jsonKey = value;
     }
 
     public List<Object> getFlags() {
@@ -539,11 +575,19 @@ public void setFlags(List<Object> value) {
       _flags = value;
     }
 
-    public FieldConstraints getConstraint() {
+    public AssemblyModel getModel() {
+      return _model;
+    }
+
+    public void setModel(AssemblyModel value) {
+      _model = value;
+    }
+
+    public AssemblyConstraints getConstraint() {
       return _constraint;
     }
 
-    public void setConstraint(FieldConstraints value) {
+    public void setConstraint(AssemblyConstraints value) {
       _constraint = value;
     }
 
@@ -595,22 +639,89 @@ public boolean removeExample(Example item) {
     public String toString() {
       return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
     }
+
+    /**
+     * Provides a root name, for when the definition is used as the root of a node
+     * hierarchy.
+     */
+    @MetaschemaField(
+        formalName = "Root Name",
+        description = "Provides a root name, for when the definition is used as the root of a node hierarchy.",
+        name = "root-name",
+        moduleClass = MetaschemaModelModule.class)
+    public static final class RootName implements IBoundObject {
+      private final IMetaschemaData __metaschemaData;
+
+      /**
+       * "Used for binary formats instead of the textual name."
+       */
+      @BoundFlag(
+          formalName = "Numeric Index",
+          description = "Used for binary formats instead of the textual name.",
+          name = "index",
+          typeAdapter = NonNegativeIntegerAdapter.class)
+      private BigInteger _index;
+
+      @BoundFieldValue(
+          valueKeyName = "name",
+          typeAdapter = TokenAdapter.class)
+      private String _name;
+
+      public RootName() {
+        this(null);
+      }
+
+      public RootName(IMetaschemaData data) {
+        this.__metaschemaData = data;
+      }
+
+      @Override
+      public IMetaschemaData getMetaschemaData() {
+        return __metaschemaData;
+      }
+
+      public BigInteger getIndex() {
+        return _index;
+      }
+
+      public void setIndex(BigInteger value) {
+        _index = value;
+      }
+
+      public String getName() {
+        return _name;
+      }
+
+      public void setName(String value) {
+        _name = value;
+      }
+
+      @Override
+      public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
+      }
+    }
   }
 
   @MetaschemaAssembly(
-      formalName = "Global Flag Definition",
-      name = "define-flag",
+      formalName = "Global Field Definition",
+      name = "define-field",
       moduleClass = MetaschemaModelModule.class)
-  public static class DefineFlag {
+  public static final class DefineField implements IBoundObject {
+    private final IMetaschemaData __metaschemaData;
+
     @BoundFlag(
-        formalName = "Global Flag Name",
+        formalName = "Global Field Name",
         name = "name",
         required = true,
-        typeAdapter = TokenAdapter.class)
+        typeAdapter = TokenAdapter.class,
+        valueConstraints = @ValueConstraints(
+            expect = @Expect(level = IConstraint.Level.WARNING, test = "not(.=$keywords)",
+                message = "Names cannot be non-delimiting terminal symbols in Metapath syntax.")))
     private String _name;
 
     @BoundFlag(
-        formalName = "Global Flag Binary Name",
+        formalName = "Global Field Binary Name",
         name = "index",
         typeAdapter = PositiveIntegerAdapter.class)
     private BigInteger _index;
@@ -634,15 +745,16 @@ public static class DefineFlag {
     private String _deprecated;
 
     @BoundFlag(
-        formalName = "Flag Value Data Type",
+        formalName = "Field Value Data Type",
         name = "as-type",
         defaultValue = "string",
         typeAdapter = TokenAdapter.class,
         valueConstraints = @ValueConstraints(allowedValues = @AllowedValues(level = IConstraint.Level.ERROR,
             allowOthers = true,
-            values = { @AllowedValue(value = "base64", description = ""),
-                @AllowedValue(value = "boolean", description = ""), @AllowedValue(value = "date", description = ""),
-                @AllowedValue(value = "date-time", description = ""),
+            values = { @AllowedValue(value = "markup-line", description = ""),
+                @AllowedValue(value = "markup-multiline", description = ""),
+                @AllowedValue(value = "base64", description = ""), @AllowedValue(value = "boolean", description = ""),
+                @AllowedValue(value = "date", description = ""), @AllowedValue(value = "date-time", description = ""),
                 @AllowedValue(value = "date-time-with-timezone", description = ""),
                 @AllowedValue(value = "date-with-timezone", description = ""),
                 @AllowedValue(value = "day-time-duration", description = ""),
@@ -660,7 +772,7 @@ public static class DefineFlag {
     private String _asType;
 
     @BoundFlag(
-        formalName = "Default Flag Value",
+        formalName = "Default Field Value",
         name = "default",
         typeAdapter = StringAdapter.class)
     private String _default;
@@ -682,7 +794,7 @@ public static class DefineFlag {
         formalName = "Property",
         useName = "prop",
         maxOccurs = -1,
-        groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+        groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
     private List<Property> _props;
 
     @BoundField(
@@ -691,9 +803,36 @@ public static class DefineFlag {
         useName = "use-name")
     private UseName _useName;
 
+    @BoundAssembly(
+        formalName = "JSON Key",
+        description = "Used in JSON (and similar formats) to identify a flag that will be used as the property name in an object hold a collection of sibling objects. Requires that siblings must never share `json-key` values.",
+        useName = "json-key")
+    private JsonKey _jsonKey;
+
+    @BoundField(
+        formalName = "Field Value JSON Property Name",
+        useName = "json-value-key",
+        typeAdapter = TokenAdapter.class)
+    private String _jsonValueKey;
+
+    @BoundAssembly(
+        formalName = "Flag Used as the Field Value's JSON Property Name",
+        useName = "json-value-key-flag")
+    private JsonValueKeyFlag _jsonValueKeyFlag;
+
+    @BoundChoiceGroup(
+        maxOccurs = -1,
+        assemblies = {
+            @BoundGroupedAssembly(formalName = "Inline Flag Definition", useName = "define-flag",
+                binding = InlineDefineFlag.class),
+            @BoundGroupedAssembly(formalName = "Flag Reference", useName = "flag", binding = FlagReference.class)
+        },
+        groupAs = @GroupAs(name = "flags", inJson = JsonGroupAsBehavior.LIST))
+    private List<Object> _flags;
+
     @BoundAssembly(
         useName = "constraint")
-    private FlagConstraints _constraint;
+    private FieldConstraints _constraint;
 
     @BoundField(
         formalName = "Remarks",
@@ -705,9 +844,22 @@ public static class DefineFlag {
         formalName = "Example",
         useName = "example",
         maxOccurs = -1,
-        groupAs = @GroupAs(name = "examples", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+        groupAs = @GroupAs(name = "examples", inJson = JsonGroupAsBehavior.LIST))
     private List<Example> _examples;
 
+    public DefineField() {
+      this(null);
+    }
+
+    public DefineField(IMetaschemaData data) {
+      this.__metaschemaData = data;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return __metaschemaData;
+    }
+
     public String getName() {
       return _name;
     }
@@ -816,11 +968,43 @@ public void setUseName(UseName value) {
       _useName = value;
     }
 
-    public FlagConstraints getConstraint() {
+    public JsonKey getJsonKey() {
+      return _jsonKey;
+    }
+
+    public void setJsonKey(JsonKey value) {
+      _jsonKey = value;
+    }
+
+    public String getJsonValueKey() {
+      return _jsonValueKey;
+    }
+
+    public void setJsonValueKey(String value) {
+      _jsonValueKey = value;
+    }
+
+    public JsonValueKeyFlag getJsonValueKeyFlag() {
+      return _jsonValueKeyFlag;
+    }
+
+    public void setJsonValueKeyFlag(JsonValueKeyFlag value) {
+      _jsonValueKeyFlag = value;
+    }
+
+    public List<Object> getFlags() {
+      return _flags;
+    }
+
+    public void setFlags(List<Object> value) {
+      _flags = value;
+    }
+
+    public FieldConstraints getConstraint() {
       return _constraint;
     }
 
-    public void setConstraint(FlagConstraints value) {
+    public void setConstraint(FieldConstraints value) {
       _constraint = value;
     }
 
@@ -874,63 +1058,25 @@ public String toString() {
     }
   }
 
-  /**
-   * Imports a set of Metaschema modules contained in another resource. Imports
-   * support the reuse of common information structures.
-   */
   @MetaschemaAssembly(
-      formalName = "Module Import",
-      description = "Imports a set of Metaschema modules contained in another resource. Imports support the reuse of common information structures.",
-      name = "import",
+      formalName = "Global Flag Definition",
+      name = "define-flag",
       moduleClass = MetaschemaModelModule.class)
-  public static class Import {
-    /**
-     * "A relative or absolute URI for retrieving an out-of-line Metaschema
-     * definition."
-     */
-    @BoundFlag(
-        formalName = "Import URI Reference",
-        description = "A relative or absolute URI for retrieving an out-of-line Metaschema definition.",
-        name = "href",
-        required = true,
-        typeAdapter = UriReferenceAdapter.class)
-    private URI _href;
-
-    public URI getHref() {
-      return _href;
-    }
-
-    public void setHref(URI value) {
-      _href = value;
-    }
-
-    @Override
-    public String toString() {
-      return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
-    }
-  }
+  public static final class DefineFlag implements IBoundObject {
+    private final IMetaschemaData __metaschemaData;
 
-  /**
-   * In XML, an element with structured element content. In JSON, an object with
-   * properties. Defined globally, an assembly can be assigned to appear in the
-   * <code>model</code> of any assembly (another assembly type, or itself), by
-   * <code>assembly</code> reference.
-   */
-  @MetaschemaAssembly(
-      formalName = "Global Assembly Definition",
-      description = "In XML, an element with structured element content. In JSON, an object with properties. Defined globally, an assembly can be assigned to appear in the `model` of any assembly (another assembly type, or itself), by `assembly` reference.",
-      name = "define-assembly",
-      moduleClass = MetaschemaModelModule.class)
-  public static class DefineAssembly {
     @BoundFlag(
-        formalName = "Global Assembly Name",
+        formalName = "Global Flag Name",
         name = "name",
         required = true,
-        typeAdapter = TokenAdapter.class)
+        typeAdapter = TokenAdapter.class,
+        valueConstraints = @ValueConstraints(
+            expect = @Expect(level = IConstraint.Level.WARNING, test = "not(.=$keywords)",
+                message = "Names cannot be non-delimiting terminal symbols in Metapath syntax.")))
     private String _name;
 
     @BoundFlag(
-        formalName = "Global Assembly Binary Name",
+        formalName = "Global Flag Binary Name",
         name = "index",
         typeAdapter = PositiveIntegerAdapter.class)
     private BigInteger _index;
@@ -953,6 +1099,38 @@ public static class DefineAssembly {
         typeAdapter = StringAdapter.class)
     private String _deprecated;
 
+    @BoundFlag(
+        formalName = "Flag Value Data Type",
+        name = "as-type",
+        defaultValue = "string",
+        typeAdapter = TokenAdapter.class,
+        valueConstraints = @ValueConstraints(allowedValues = @AllowedValues(level = IConstraint.Level.ERROR,
+            allowOthers = true,
+            values = { @AllowedValue(value = "base64", description = ""),
+                @AllowedValue(value = "boolean", description = ""), @AllowedValue(value = "date", description = ""),
+                @AllowedValue(value = "date-time", description = ""),
+                @AllowedValue(value = "date-time-with-timezone", description = ""),
+                @AllowedValue(value = "date-with-timezone", description = ""),
+                @AllowedValue(value = "day-time-duration", description = ""),
+                @AllowedValue(value = "decimal", description = ""),
+                @AllowedValue(value = "email-address", description = ""),
+                @AllowedValue(value = "hostname", description = ""), @AllowedValue(value = "integer", description = ""),
+                @AllowedValue(value = "ip-v4-address", description = ""),
+                @AllowedValue(value = "ip-v6-address", description = ""),
+                @AllowedValue(value = "non-negative-integer", description = ""),
+                @AllowedValue(value = "positive-integer", description = ""),
+                @AllowedValue(value = "string", description = ""), @AllowedValue(value = "token", description = ""),
+                @AllowedValue(value = "uri", description = ""),
+                @AllowedValue(value = "uri-reference", description = ""),
+                @AllowedValue(value = "uuid", description = "") })))
+    private String _asType;
+
+    @BoundFlag(
+        formalName = "Default Flag Value",
+        name = "default",
+        typeAdapter = StringAdapter.class)
+    private String _default;
+
     @BoundField(
         formalName = "Formal Name",
         description = "A formal name for the data construct, to be presented in documentation.",
@@ -970,7 +1148,7 @@ public static class DefineAssembly {
         formalName = "Property",
         useName = "prop",
         maxOccurs = -1,
-        groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+        groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
     private List<Property> _props;
 
     @BoundField(
@@ -979,36 +1157,9 @@ public static class DefineAssembly {
         useName = "use-name")
     private UseName _useName;
 
-    @BoundField(
-        formalName = "Root Name",
-        description = "Provides a root name, for when the definition is used as the root of a node hierarchy.",
-        useName = "root-name",
-        minOccurs = 1)
-    private RootName _rootName;
-
-    @BoundAssembly(
-        formalName = "JSON Key",
-        description = "Used in JSON (and similar formats) to identify a flag that will be used as the property name in an object hold a collection of sibling objects. Requires that siblings must never share `json-key` values.",
-        useName = "json-key")
-    private JsonKey _jsonKey;
-
-    @BoundChoiceGroup(
-        maxOccurs = -1,
-        assemblies = {
-            @BoundGroupedAssembly(formalName = "Inline Flag Definition", useName = "define-flag",
-                binding = InlineDefineFlag.class),
-            @BoundGroupedAssembly(formalName = "Flag Reference", useName = "flag", binding = FlagReference.class)
-        },
-        groupAs = @GroupAs(name = "flags", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
-    private List<Object> _flags;
-
-    @BoundAssembly(
-        useName = "model")
-    private AssemblyModel _model;
-
     @BoundAssembly(
         useName = "constraint")
-    private AssemblyConstraints _constraint;
+    private FlagConstraints _constraint;
 
     @BoundField(
         formalName = "Remarks",
@@ -1020,9 +1171,22 @@ public static class DefineAssembly {
         formalName = "Example",
         useName = "example",
         maxOccurs = -1,
-        groupAs = @GroupAs(name = "examples", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+        groupAs = @GroupAs(name = "examples", inJson = JsonGroupAsBehavior.LIST))
     private List<Example> _examples;
 
+    public DefineFlag() {
+      this(null);
+    }
+
+    public DefineFlag(IMetaschemaData data) {
+      this.__metaschemaData = data;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return __metaschemaData;
+    }
+
     public String getName() {
       return _name;
     }
@@ -1055,6 +1219,22 @@ public void setDeprecated(String value) {
       _deprecated = value;
     }
 
+    public String getAsType() {
+      return _asType;
+    }
+
+    public void setAsType(String value) {
+      _asType = value;
+    }
+
+    public String getDefault() {
+      return _default;
+    }
+
+    public void setDefault(String value) {
+      _default = value;
+    }
+
     public String getFormalName() {
       return _formalName;
     }
@@ -1115,43 +1295,11 @@ public void setUseName(UseName value) {
       _useName = value;
     }
 
-    public RootName getRootName() {
-      return _rootName;
-    }
-
-    public void setRootName(RootName value) {
-      _rootName = value;
-    }
-
-    public JsonKey getJsonKey() {
-      return _jsonKey;
-    }
-
-    public void setJsonKey(JsonKey value) {
-      _jsonKey = value;
-    }
-
-    public List<Object> getFlags() {
-      return _flags;
-    }
-
-    public void setFlags(List<Object> value) {
-      _flags = value;
-    }
-
-    public AssemblyModel getModel() {
-      return _model;
-    }
-
-    public void setModel(AssemblyModel value) {
-      _model = value;
-    }
-
-    public AssemblyConstraints getConstraint() {
+    public FlagConstraints getConstraint() {
       return _constraint;
     }
 
-    public void setConstraint(AssemblyConstraints value) {
+    public void setConstraint(FlagConstraints value) {
       _constraint = value;
     }
 
@@ -1203,52 +1351,5 @@ public boolean removeExample(Example item) {
     public String toString() {
       return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
     }
-
-    /**
-     * Provides a root name, for when the definition is used as the root of a node
-     * hierarchy.
-     */
-    @MetaschemaField(
-        formalName = "Root Name",
-        description = "Provides a root name, for when the definition is used as the root of a node hierarchy.",
-        name = "root-name",
-        moduleClass = MetaschemaModelModule.class)
-    public static class RootName {
-      /**
-       * "Used for binary formats instead of the textual name."
-       */
-      @BoundFlag(
-          formalName = "Numeric Index",
-          description = "Used for binary formats instead of the textual name.",
-          name = "index",
-          typeAdapter = NonNegativeIntegerAdapter.class)
-      private BigInteger _index;
-
-      @BoundFieldValue(
-          valueKeyName = "name",
-          typeAdapter = TokenAdapter.class)
-      private String _name;
-
-      public BigInteger getIndex() {
-        return _index;
-      }
-
-      public void setIndex(BigInteger value) {
-        _index = value;
-      }
-
-      public String getName() {
-        return _name;
-      }
-
-      public void setName(String value) {
-        _name = value;
-      }
-
-      @Override
-      public String toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
-      }
-    }
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetapathContext.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetapathContext.java
similarity index 81%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetapathContext.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetapathContext.java
index 6edea95c9..41adadc2d 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetapathContext.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetapathContext.java
@@ -24,8 +24,10 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly;
@@ -46,13 +48,15 @@
 @MetaschemaAssembly(
     name = "metapath-context",
     moduleClass = MetaschemaModelModule.class)
-public class MetapathContext {
+public final class MetapathContext implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundAssembly(
       description = "A Metapath expression identifying the model node that the constraints will be applied to.",
       useName = "metapath",
       minOccurs = 1,
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "metapaths", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "metapaths", inJson = JsonGroupAsBehavior.LIST))
   private List<MetaschemaMetapath> _metapaths;
 
   @BoundAssembly(
@@ -60,10 +64,10 @@ public class MetapathContext {
   private AssemblyConstraints _constraints;
 
   @BoundAssembly(
-      useName = "metapath-context",
+      useName = "context",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "metapath-contexts", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
-  private List<MetapathContext> _metapathContexts;
+      groupAs = @GroupAs(name = "contexts", inJson = JsonGroupAsBehavior.LIST))
+  private List<MetapathContext> _contexts;
 
   @BoundField(
       formalName = "Remarks",
@@ -71,6 +75,19 @@ public class MetapathContext {
       useName = "remarks")
   private Remarks _remarks;
 
+  public MetapathContext() {
+    this(null);
+  }
+
+  public MetapathContext(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public List<MetaschemaMetapath> getMetapaths() {
     return _metapaths;
   }
@@ -115,12 +132,12 @@ public void setConstraints(AssemblyConstraints value) {
     _constraints = value;
   }
 
-  public List<MetapathContext> getMetapathContexts() {
-    return _metapathContexts;
+  public List<MetapathContext> getContexts() {
+    return _contexts;
   }
 
-  public void setMetapathContexts(List<MetapathContext> value) {
-    _metapathContexts = value;
+  public void setContexts(List<MetapathContext> value) {
+    _contexts = value;
   }
 
   /**
@@ -130,12 +147,12 @@ public void setMetapathContexts(List<MetapathContext> value) {
    *          the item to add
    * @return {@code true}
    */
-  public boolean addMetapathContext(MetapathContext item) {
+  public boolean addContext(MetapathContext item) {
     MetapathContext value = ObjectUtils.requireNonNull(item, "item cannot be null");
-    if (_metapathContexts == null) {
-      _metapathContexts = new LinkedList<>();
+    if (_contexts == null) {
+      _contexts = new LinkedList<>();
     }
-    return _metapathContexts.add(value);
+    return _contexts.add(value);
   }
 
   /**
@@ -146,9 +163,9 @@ public boolean addMetapathContext(MetapathContext item) {
    *          the item to remove
    * @return {@code true} if the item was removed or {@code false} otherwise
    */
-  public boolean removeMetapathContext(MetapathContext item) {
+  public boolean removeContext(MetapathContext item) {
     MetapathContext value = ObjectUtils.requireNonNull(item, "item cannot be null");
-    return _metapathContexts != null && _metapathContexts.remove(value);
+    return _contexts != null && _contexts.remove(value);
   }
 
   public Remarks getRemarks() {
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaMetaConstraints.java
similarity index 63%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaMetaConstraints.java
index 364eaaa60..71e4c8bc8 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaMetaConstraints.java
@@ -24,11 +24,12 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.UriAdapter;
-import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly;
@@ -58,58 +59,31 @@
     name = "metaschema-meta-constraints",
     moduleClass = MetaschemaModelModule.class,
     rootName = "metaschema-meta-constraints")
-public class MetaschemaMetaConstraints {
-  @BoundAssembly(
-      description = "Declares a set of Metaschema constraints from an out-of-line resource to import, supporting composition of constraint sets.",
-      useName = "import",
-      maxOccurs = -1,
-      groupAs = @GroupAs(name = "imports", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
-  private List<Import> _imports;
+public final class MetaschemaMetaConstraints implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
 
   @BoundAssembly(
       useName = "definition-context")
   private DefinitionContext _definitionContext;
 
   @BoundAssembly(
-      useName = "metapath-context",
+      useName = "context",
       minOccurs = 1,
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "metapath-contexts", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
-  private List<MetapathContext> _metapathContexts;
-
-  public List<Import> getImports() {
-    return _imports;
-  }
+      groupAs = @GroupAs(name = "contexts", inJson = JsonGroupAsBehavior.LIST))
+  private List<MetapathContext> _contexts;
 
-  public void setImports(List<Import> value) {
-    _imports = value;
+  public MetaschemaMetaConstraints() {
+    this(null);
   }
 
-  /**
-   * Add a new {@link Import} item to the underlying collection.
-   *
-   * @param item
-   *          the item to add
-   * @return {@code true}
-   */
-  public boolean addImport(Import item) {
-    Import value = ObjectUtils.requireNonNull(item, "item cannot be null");
-    if (_imports == null) {
-      _imports = new LinkedList<>();
-    }
-    return _imports.add(value);
+  public MetaschemaMetaConstraints(IMetaschemaData data) {
+    this.__metaschemaData = data;
   }
 
-  /**
-   * Remove the first matching {@link Import} item from the underlying collection.
-   *
-   * @param item
-   *          the item to remove
-   * @return {@code true} if the item was removed or {@code false} otherwise
-   */
-  public boolean removeImport(Import item) {
-    Import value = ObjectUtils.requireNonNull(item, "item cannot be null");
-    return _imports != null && _imports.remove(value);
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
   }
 
   public DefinitionContext getDefinitionContext() {
@@ -120,12 +94,12 @@ public void setDefinitionContext(DefinitionContext value) {
     _definitionContext = value;
   }
 
-  public List<MetapathContext> getMetapathContexts() {
-    return _metapathContexts;
+  public List<MetapathContext> getContexts() {
+    return _contexts;
   }
 
-  public void setMetapathContexts(List<MetapathContext> value) {
-    _metapathContexts = value;
+  public void setContexts(List<MetapathContext> value) {
+    _contexts = value;
   }
 
   /**
@@ -135,12 +109,12 @@ public void setMetapathContexts(List<MetapathContext> value) {
    *          the item to add
    * @return {@code true}
    */
-  public boolean addMetapathContext(MetapathContext item) {
+  public boolean addContext(MetapathContext item) {
     MetapathContext value = ObjectUtils.requireNonNull(item, "item cannot be null");
-    if (_metapathContexts == null) {
-      _metapathContexts = new LinkedList<>();
+    if (_contexts == null) {
+      _contexts = new LinkedList<>();
     }
-    return _metapathContexts.add(value);
+    return _contexts.add(value);
   }
 
   /**
@@ -151,9 +125,9 @@ public boolean addMetapathContext(MetapathContext item) {
    *          the item to remove
    * @return {@code true} if the item was removed or {@code false} otherwise
    */
-  public boolean removeMetapathContext(MetapathContext item) {
+  public boolean removeContext(MetapathContext item) {
     MetapathContext value = ObjectUtils.requireNonNull(item, "item cannot be null");
-    return _metapathContexts != null && _metapathContexts.remove(value);
+    return _contexts != null && _contexts.remove(value);
   }
 
   @Override
@@ -164,7 +138,9 @@ public String toString() {
   @MetaschemaAssembly(
       name = "definition-context",
       moduleClass = MetaschemaModelModule.class)
-  public static class DefinitionContext {
+  public static final class DefinitionContext implements IBoundObject {
+    private final IMetaschemaData __metaschemaData;
+
     @BoundFlag(
         name = "name",
         required = true,
@@ -188,6 +164,19 @@ public static class DefinitionContext {
         useName = "remarks")
     private Remarks _remarks;
 
+    public DefinitionContext() {
+      this(null);
+    }
+
+    public DefinitionContext(IMetaschemaData data) {
+      this.__metaschemaData = data;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return __metaschemaData;
+    }
+
     public String getName() {
       return _name;
     }
@@ -225,38 +214,4 @@ public String toString() {
       return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
     }
   }
-
-  /**
-   * Declares a set of Metaschema constraints from an out-of-line resource to
-   * import, supporting composition of constraint sets.
-   */
-  @MetaschemaAssembly(
-      description = "Declares a set of Metaschema constraints from an out-of-line resource to import, supporting composition of constraint sets.",
-      name = "import",
-      moduleClass = MetaschemaModelModule.class)
-  public static class Import {
-    /**
-     * "A relative or absolute URI for retrieving an out-of-line Metaschema
-     * constraint definition."
-     */
-    @BoundFlag(
-        description = "A relative or absolute URI for retrieving an out-of-line Metaschema constraint definition.",
-        name = "href",
-        required = true,
-        typeAdapter = UriReferenceAdapter.class)
-    private URI _href;
-
-    public URI getHref() {
-      return _href;
-    }
-
-    public void setHref(URI value) {
-      _href = value;
-    }
-
-    @Override
-    public String toString() {
-      return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
-    }
-  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaMetapath.java
similarity index 83%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaMetapath.java
index 878fd260d..c36b854ca 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaMetapath.java
@@ -24,9 +24,11 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 
@@ -45,13 +47,28 @@
     description = "A Metapath expression identifying the model node that the constraints will be applied to.",
     name = "metaschema-metapath",
     moduleClass = MetaschemaModelModule.class)
-public class MetaschemaMetapath {
+public final class MetaschemaMetapath implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       name = "target",
       required = true,
       typeAdapter = StringAdapter.class)
   private String _target;
 
+  public MetaschemaMetapath() {
+    this(null);
+  }
+
+  public MetaschemaMetapath(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getTarget() {
     return _target;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaModelModule.java
similarity index 95%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaModelModule.java
index dc234b77a..904a7b0d2 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaModelModule.java
@@ -24,19 +24,19 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.model.AbstractBoundModule;
 import gov.nist.secauto.metaschema.databind.model.IBoundModule;
-import gov.nist.secauto.metaschema.databind.model.annotations.Module;
+import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule;
 
 import java.net.URI;
 import java.util.List;
 
-@Module(
+@MetaschemaModule(
     fields = {
         UseName.class,
         Remarks.class,
@@ -53,7 +53,7 @@
         FlagReference.class,
         AssemblyModel.class,
         JsonValueKeyFlag.class,
-        GroupAs.class,
+        GroupingAs.class,
         Example.class,
         Property.class,
         JsonKey.class,
@@ -75,6 +75,7 @@
         TargetedHasCardinalityConstraint.class,
         MetaschemaModuleConstraints.class,
         MetaschemaMetaConstraints.class,
+        MetaschemaMetapath.class,
         MetapathContext.class
     })
 public final class MetaschemaModelModule
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaModuleConstraints.java
similarity index 83%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaModuleConstraints.java
index e40f725aa..f54173f72 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaModuleConstraints.java
@@ -24,12 +24,14 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.UriAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.UriReferenceAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -66,7 +68,9 @@
     name = "metaschema-module-constraints",
     moduleClass = MetaschemaModelModule.class,
     rootName = "METASCHEMA-CONSTRAINTS")
-public class MetaschemaModuleConstraints {
+public final class MetaschemaModuleConstraints implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundField(
       description = "The name of this constraint set.",
       useName = "name",
@@ -83,16 +87,29 @@ public class MetaschemaModuleConstraints {
       description = "Declares a set of Metaschema constraints from an out-of-line resource to import, supporting composition of constraint sets.",
       useName = "import",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "imports", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "imports", inJson = JsonGroupAsBehavior.LIST))
   private List<Import> _imports;
 
   @BoundAssembly(
       useName = "scope",
       minOccurs = 1,
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "scopes", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "scopes", inJson = JsonGroupAsBehavior.LIST))
   private List<Scope> _scopes;
 
+  public MetaschemaModuleConstraints() {
+    this(null);
+  }
+
+  public MetaschemaModuleConstraints(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getName() {
     return _name;
   }
@@ -184,10 +201,61 @@ public String toString() {
     return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
   }
 
+  /**
+   * Declares a set of Metaschema constraints from an out-of-line resource to
+   * import, supporting composition of constraint sets.
+   */
+  @MetaschemaAssembly(
+      description = "Declares a set of Metaschema constraints from an out-of-line resource to import, supporting composition of constraint sets.",
+      name = "import",
+      moduleClass = MetaschemaModelModule.class)
+  public static final class Import implements IBoundObject {
+    private final IMetaschemaData __metaschemaData;
+
+    /**
+     * "A relative or absolute URI for retrieving an out-of-line Metaschema
+     * constraint definition."
+     */
+    @BoundFlag(
+        description = "A relative or absolute URI for retrieving an out-of-line Metaschema constraint definition.",
+        name = "href",
+        required = true,
+        typeAdapter = UriReferenceAdapter.class)
+    private URI _href;
+
+    public Import() {
+      this(null);
+    }
+
+    public Import(IMetaschemaData data) {
+      this.__metaschemaData = data;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return __metaschemaData;
+    }
+
+    public URI getHref() {
+      return _href;
+    }
+
+    public void setHref(URI value) {
+      _href = value;
+    }
+
+    @Override
+    public String toString() {
+      return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
+    }
+  }
+
   @MetaschemaAssembly(
       name = "scope",
       moduleClass = MetaschemaModelModule.class)
-  public static class Scope {
+  public static final class Scope implements IBoundObject {
+    private final IMetaschemaData __metaschemaData;
+
     @BoundFlag(
         name = "metaschema-namespace",
         required = true,
@@ -208,8 +276,8 @@ public static class Scope {
             @BoundGroupedAssembly(useName = "field", binding = Field.class),
             @BoundGroupedAssembly(useName = "flag", binding = Flag.class)
         },
-        groupAs = @GroupAs(name = "constraints", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
-    private List<Object> _constraints;
+        groupAs = @GroupAs(name = "constraints", inJson = JsonGroupAsBehavior.LIST))
+    private List<? extends IValueConstraintsBase> _constraints;
 
     @BoundField(
         formalName = "Remarks",
@@ -217,6 +285,19 @@ public static class Scope {
         useName = "remarks")
     private Remarks _remarks;
 
+    public Scope() {
+      this(null);
+    }
+
+    public Scope(IMetaschemaData data) {
+      this.__metaschemaData = data;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return __metaschemaData;
+    }
+
     public URI getMetaschemaNamespace() {
       return _metaschemaNamespace;
     }
@@ -233,11 +314,11 @@ public void setMetaschemaShortName(String value) {
       _metaschemaShortName = value;
     }
 
-    public List<Object> getConstraints() {
+    public List<? extends IValueConstraintsBase> getConstraints() {
       return _constraints;
     }
 
-    public void setConstraints(List<Object> value) {
+    public void setConstraints(List<? extends IValueConstraintsBase> value) {
       _constraints = value;
     }
 
@@ -255,9 +336,11 @@ public String toString() {
     }
 
     @MetaschemaAssembly(
-        name = "flag",
+        name = "assembly",
         moduleClass = MetaschemaModelModule.class)
-    public static class Flag implements IValueConstraintsBase {
+    public static final class Assembly implements IModelConstraintsBase {
+      private final IMetaschemaData __metaschemaData;
+
       @BoundFlag(
           formalName = "Constraint Target Metapath Expression",
           name = "target",
@@ -270,20 +353,34 @@ public static class Flag implements IValueConstraintsBase {
           maxOccurs = -1,
           assemblies = {
               @BoundGroupedAssembly(formalName = "Allowed Values Constraint", useName = "allowed-values",
-                  binding = FlagAllowedValues.class),
+                  binding = TargetedAllowedValuesConstraint.class),
               @BoundGroupedAssembly(formalName = "Expect Condition Constraint", useName = "expect",
-                  binding = FlagExpect.class),
-              @BoundGroupedAssembly(formalName = "Index Has Key Constraint", useName = "index-has-key",
-                  binding = FlagIndexHasKey.class),
+                  binding = TargetedExpectConstraint.class),
+              @BoundGroupedAssembly(formalName = "Targeted Index Has Key Constraint", useName = "index-has-key",
+                  binding = TargetedIndexHasKeyConstraint.class),
               @BoundGroupedAssembly(formalName = "Value Matches Constraint", useName = "matches",
-                  binding = FlagMatches.class)
+                  binding = TargetedMatchesConstraint.class),
+              @BoundGroupedAssembly(formalName = "Targeted Unique Constraint", useName = "is-unique",
+                  binding = TargetedIsUniqueConstraint.class),
+              @BoundGroupedAssembly(formalName = "Targeted Index Constraint", useName = "index",
+                  binding = TargetedIndexConstraint.class),
+              @BoundGroupedAssembly(formalName = "Targeted Cardinality Constraint", useName = "has-cardinality",
+                  binding = TargetedHasCardinalityConstraint.class)
           },
-          groupAs = @GroupAs(name = "rules", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+          groupAs = @GroupAs(name = "rules", inJson = JsonGroupAsBehavior.LIST))
       private List<? extends ITargetedConstraintBase> _rules;
 
+      public Assembly() {
+        this(null);
+      }
+
+      public Assembly(IMetaschemaData data) {
+        this.__metaschemaData = data;
+      }
+
       @Override
-      public List<ConstraintLetExpression> getLets() {
-        return CollectionUtil.emptyList();
+      public IMetaschemaData getMetaschemaData() {
+        return __metaschemaData;
       }
 
       public String getTarget() {
@@ -294,6 +391,11 @@ public void setTarget(String value) {
         _target = value;
       }
 
+      @Override
+      public List<ConstraintLetExpression> getLets() {
+        return CollectionUtil.emptyList();
+      }
+
       @Override
       public List<? extends ITargetedConstraintBase> getRules() {
         return _rules;
@@ -312,7 +414,9 @@ public String toString() {
     @MetaschemaAssembly(
         name = "field",
         moduleClass = MetaschemaModelModule.class)
-    public static class Field implements IValueConstraintsBase {
+    public static final class Field implements IValueConstraintsBase {
+      private final IMetaschemaData __metaschemaData;
+
       @BoundFlag(
           formalName = "Constraint Target Metapath Expression",
           name = "target",
@@ -333,9 +437,22 @@ public static class Field implements IValueConstraintsBase {
               @BoundGroupedAssembly(formalName = "Value Matches Constraint", useName = "matches",
                   binding = TargetedMatchesConstraint.class)
           },
-          groupAs = @GroupAs(name = "rules", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+          groupAs = @GroupAs(name = "rules", inJson = JsonGroupAsBehavior.LIST))
       private List<? extends ITargetedConstraintBase> _rules;
 
+      public Field() {
+        this(null);
+      }
+
+      public Field(IMetaschemaData data) {
+        this.__metaschemaData = data;
+      }
+
+      @Override
+      public IMetaschemaData getMetaschemaData() {
+        return __metaschemaData;
+      }
+
       public String getTarget() {
         return _target;
       }
@@ -365,9 +482,11 @@ public String toString() {
     }
 
     @MetaschemaAssembly(
-        name = "assembly",
+        name = "flag",
         moduleClass = MetaschemaModelModule.class)
-    public static class Assembly implements IModelConstraintsBase {
+    public static final class Flag implements IBoundObject, IValueConstraintsBase {
+      private final IMetaschemaData __metaschemaData;
+
       @BoundFlag(
           formalName = "Constraint Target Metapath Expression",
           name = "target",
@@ -380,29 +499,28 @@ public static class Assembly implements IModelConstraintsBase {
           maxOccurs = -1,
           assemblies = {
               @BoundGroupedAssembly(formalName = "Allowed Values Constraint", useName = "allowed-values",
-                  binding = TargetedAllowedValuesConstraint.class),
+                  binding = FlagAllowedValues.class),
               @BoundGroupedAssembly(formalName = "Expect Condition Constraint", useName = "expect",
-                  binding = TargetedExpectConstraint.class),
-              @BoundGroupedAssembly(formalName = "Targeted Index Has Key Constraint", useName = "index-has-key",
-                  binding = TargetedIndexHasKeyConstraint.class),
+                  binding = FlagExpect.class),
+              @BoundGroupedAssembly(formalName = "Index Has Key Constraint", useName = "index-has-key",
+                  binding = FlagIndexHasKey.class),
               @BoundGroupedAssembly(formalName = "Value Matches Constraint", useName = "matches",
-                  binding = TargetedMatchesConstraint.class),
-              @BoundGroupedAssembly(formalName = "Targeted Unique Constraint", useName = "is-unique",
-                  binding = TargetedIsUniqueConstraint.class),
-              @BoundGroupedAssembly(formalName = "Targeted Index Constraint", useName = "index",
-                  binding = TargetedIndexConstraint.class),
-              @BoundGroupedAssembly(formalName = "Targeted Cardinality Constraint", useName = "has-cardinality",
-                  binding = TargetedHasCardinalityConstraint.class)
+                  binding = FlagMatches.class)
           },
-          groupAs = @GroupAs(name = "rules", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+          groupAs = @GroupAs(name = "rules", inJson = JsonGroupAsBehavior.LIST))
       private List<? extends ITargetedConstraintBase> _rules;
 
-      public String getTarget() {
-        return _target;
+      public Flag() {
+        this(null);
       }
 
-      public void setTarget(String value) {
-        _target = value;
+      public Flag(IMetaschemaData data) {
+        this.__metaschemaData = data;
+      }
+
+      @Override
+      public IMetaschemaData getMetaschemaData() {
+        return __metaschemaData;
       }
 
       @Override
@@ -410,6 +528,14 @@ public List<ConstraintLetExpression> getLets() {
         return CollectionUtil.emptyList();
       }
 
+      public String getTarget() {
+        return _target;
+      }
+
+      public void setTarget(String value) {
+        _target = value;
+      }
+
       @Override
       public List<? extends ITargetedConstraintBase> getRules() {
         return _rules;
@@ -425,38 +551,4 @@ public String toString() {
       }
     }
   }
-
-  /**
-   * Declares a set of Metaschema constraints from an out-of-line resource to
-   * import, supporting composition of constraint sets.
-   */
-  @MetaschemaAssembly(
-      description = "Declares a set of Metaschema constraints from an out-of-line resource to import, supporting composition of constraint sets.",
-      name = "import",
-      moduleClass = MetaschemaModelModule.class)
-  public static class Import {
-    /**
-     * "A relative or absolute URI for retrieving an out-of-line Metaschema
-     * constraint definition."
-     */
-    @BoundFlag(
-        description = "A relative or absolute URI for retrieving an out-of-line Metaschema constraint definition.",
-        name = "href",
-        required = true,
-        typeAdapter = UriReferenceAdapter.class)
-    private URI _href;
-
-    public URI getHref() {
-      return _href;
-    }
-
-    public void setHref(URI value) {
-      _href = value;
-    }
-
-    @Override
-    public String toString() {
-      return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).toString();
-    }
-  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Property.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Property.java
similarity index 86%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Property.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Property.java
index 7db9f3ac5..55d9793ce 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Property.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Property.java
@@ -24,18 +24,20 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.UriAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
-import java.lang.Override;
-import java.lang.String;
-import java.net.URI;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.net.URI;
+
 @SuppressWarnings({
     "PMD.DataClass",
     "PMD.FieldNamingConventions"
@@ -44,7 +46,9 @@
     formalName = "Property",
     name = "property",
     moduleClass = MetaschemaModelModule.class)
-public class Property {
+public final class Property implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Property Name",
       name = "name",
@@ -66,6 +70,19 @@ public class Property {
       typeAdapter = TokenAdapter.class)
   private String _value;
 
+  public Property() {
+    this(null);
+  }
+
+  public Property(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getName() {
     return _name;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Remarks.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Remarks.java
similarity index 89%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Remarks.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Remarks.java
index 96baa3998..b1a49d561 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/Remarks.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/Remarks.java
@@ -24,11 +24,13 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultilineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValue;
 import gov.nist.secauto.metaschema.databind.model.annotations.AllowedValues;
@@ -36,8 +38,7 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField;
 import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints;
-import java.lang.Override;
-import java.lang.String;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -54,7 +55,9 @@
     description = "Any explanatory or helpful information to be provided about the remarks parent.",
     name = "remarks",
     moduleClass = MetaschemaModelModule.class)
-public class Remarks {
+public final class Remarks implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   /**
    * "Mark as &lsquo;XML&rsquo; for XML-only or &lsquo;JSON&rsquo; for JSON-only
    * remarks."
@@ -76,6 +79,19 @@ public class Remarks {
       typeAdapter = MarkupMultilineAdapter.class)
   private MarkupMultiline _remark;
 
+  public Remarks() {
+    this(null);
+  }
+
+  public Remarks(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public String getClazz() {
     return _clazz;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedAllowedValuesConstraint.java
similarity index 90%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedAllowedValuesConstraint.java
index 971151767..679bb6d3e 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedAllowedValuesConstraint.java
@@ -24,12 +24,14 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -57,7 +59,9 @@
     formalName = "Allowed Values Constraint",
     name = "targeted-allowed-values-constraint",
     moduleClass = MetaschemaModelModule.class)
-public class TargetedAllowedValuesConstraint implements ITargetedConstraintBase {
+public final class TargetedAllowedValuesConstraint implements IBoundObject, ITargetedConstraintBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Constraint Identifier",
       name = "id",
@@ -77,7 +81,9 @@ public class TargetedAllowedValuesConstraint implements ITargetedConstraintBase
           @AllowedValue(value = "WARNING",
               description = "A violation of the constraint represents a potential issue with the content."),
           @AllowedValue(value = "INFORMATIONAL",
-              description = "A violation of the constraint represents a point of interest.") })))
+              description = "A violation of the constraint represents a point of interest."),
+          @AllowedValue(value = "DEBUG",
+              description = "A violation of the constraint represents a fault in the content that may warrant review by a developer when performing model or tool development.") })))
   private String _level;
 
   @BoundFlag(
@@ -130,7 +136,7 @@ public class TargetedAllowedValuesConstraint implements ITargetedConstraintBase
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundField(
@@ -138,7 +144,7 @@ public class TargetedAllowedValuesConstraint implements ITargetedConstraintBase
       useName = "enum",
       minOccurs = 1,
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "enums", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "enums", inJson = JsonGroupAsBehavior.LIST))
   private List<ConstraintValueEnum> _enums;
 
   @BoundField(
@@ -147,6 +153,19 @@ public class TargetedAllowedValuesConstraint implements ITargetedConstraintBase
       useName = "remarks")
   private Remarks _remarks;
 
+  public TargetedAllowedValuesConstraint() {
+    this(null);
+  }
+
+  public TargetedAllowedValuesConstraint(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getId() {
     return _id;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedExpectConstraint.java
similarity index 89%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedExpectConstraint.java
index ddd306fa6..236e6110e 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedExpectConstraint.java
@@ -24,12 +24,14 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -57,7 +59,9 @@
     formalName = "Expect Condition Constraint",
     name = "targeted-expect-constraint",
     moduleClass = MetaschemaModelModule.class)
-public class TargetedExpectConstraint implements ITargetedConstraintBase {
+public final class TargetedExpectConstraint implements IBoundObject, ITargetedConstraintBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Constraint Identifier",
       name = "id",
@@ -77,7 +81,9 @@ public class TargetedExpectConstraint implements ITargetedConstraintBase {
           @AllowedValue(value = "WARNING",
               description = "A violation of the constraint represents a potential issue with the content."),
           @AllowedValue(value = "INFORMATIONAL",
-              description = "A violation of the constraint represents a point of interest.") })))
+              description = "A violation of the constraint represents a point of interest."),
+          @AllowedValue(value = "DEBUG",
+              description = "A violation of the constraint represents a fault in the content that may warrant review by a developer when performing model or tool development.") })))
   private String _level;
 
   @BoundFlag(
@@ -111,7 +117,7 @@ public class TargetedExpectConstraint implements ITargetedConstraintBase {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundField(
@@ -125,6 +131,19 @@ public class TargetedExpectConstraint implements ITargetedConstraintBase {
       useName = "remarks")
   private Remarks _remarks;
 
+  public TargetedExpectConstraint() {
+    this(null);
+  }
+
+  public TargetedExpectConstraint(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getId() {
     return _id;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedHasCardinalityConstraint.java
similarity index 89%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedHasCardinalityConstraint.java
index c20099b25..2d68bf488 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedHasCardinalityConstraint.java
@@ -24,13 +24,15 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -60,7 +62,9 @@
     formalName = "Targeted Cardinality Constraint",
     name = "targeted-has-cardinality-constraint",
     moduleClass = MetaschemaModelModule.class)
-public class TargetedHasCardinalityConstraint implements ITargetedConstraintBase {
+public final class TargetedHasCardinalityConstraint implements IBoundObject, ITargetedConstraintBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Constraint Identifier",
       name = "id",
@@ -80,7 +84,9 @@ public class TargetedHasCardinalityConstraint implements ITargetedConstraintBase
           @AllowedValue(value = "WARNING",
               description = "A violation of the constraint represents a potential issue with the content."),
           @AllowedValue(value = "INFORMATIONAL",
-              description = "A violation of the constraint represents a point of interest.") })))
+              description = "A violation of the constraint represents a point of interest."),
+          @AllowedValue(value = "DEBUG",
+              description = "A violation of the constraint represents a fault in the content that may warrant review by a developer when performing model or tool development.") })))
   private String _level;
 
   @BoundFlag(
@@ -121,7 +127,7 @@ public class TargetedHasCardinalityConstraint implements ITargetedConstraintBase
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundField(
@@ -130,6 +136,19 @@ public class TargetedHasCardinalityConstraint implements ITargetedConstraintBase
       useName = "remarks")
   private Remarks _remarks;
 
+  public TargetedHasCardinalityConstraint() {
+    this(null);
+  }
+
+  public TargetedHasCardinalityConstraint(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getId() {
     return _id;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedIndexConstraint.java
similarity index 89%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedIndexConstraint.java
index 58d63835c..1843c4418 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedIndexConstraint.java
@@ -24,12 +24,14 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -57,7 +59,9 @@
     formalName = "Targeted Index Constraint",
     name = "targeted-index-constraint",
     moduleClass = MetaschemaModelModule.class)
-public class TargetedIndexConstraint implements ITargetedConstraintBase {
+public final class TargetedIndexConstraint implements IBoundObject, ITargetedConstraintBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Constraint Identifier",
       name = "id",
@@ -77,7 +81,9 @@ public class TargetedIndexConstraint implements ITargetedConstraintBase {
           @AllowedValue(value = "WARNING",
               description = "A violation of the constraint represents a potential issue with the content."),
           @AllowedValue(value = "INFORMATIONAL",
-              description = "A violation of the constraint represents a point of interest.") })))
+              description = "A violation of the constraint represents a point of interest."),
+          @AllowedValue(value = "DEBUG",
+              description = "A violation of the constraint represents a fault in the content that may warrant review by a developer when performing model or tool development.") })))
   private String _level;
 
   @BoundFlag(
@@ -111,7 +117,7 @@ public class TargetedIndexConstraint implements ITargetedConstraintBase {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundAssembly(
@@ -119,7 +125,7 @@ public class TargetedIndexConstraint implements ITargetedConstraintBase {
       useName = "key-field",
       minOccurs = 1,
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "key-fields", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "key-fields", inJson = JsonGroupAsBehavior.LIST))
   private List<KeyConstraintField> _keyFields;
 
   @BoundField(
@@ -128,6 +134,19 @@ public class TargetedIndexConstraint implements ITargetedConstraintBase {
       useName = "remarks")
   private Remarks _remarks;
 
+  public TargetedIndexConstraint() {
+    this(null);
+  }
+
+  public TargetedIndexConstraint(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getId() {
     return _id;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedIndexHasKeyConstraint.java
similarity index 89%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedIndexHasKeyConstraint.java
index 8dd650d3d..88e57b316 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedIndexHasKeyConstraint.java
@@ -24,12 +24,14 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -57,7 +59,9 @@
     formalName = "Targeted Index Has Key Constraint",
     name = "targeted-index-has-key-constraint",
     moduleClass = MetaschemaModelModule.class)
-public class TargetedIndexHasKeyConstraint implements ITargetedConstraintBase {
+public final class TargetedIndexHasKeyConstraint implements IBoundObject, ITargetedConstraintBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Constraint Identifier",
       name = "id",
@@ -77,7 +81,9 @@ public class TargetedIndexHasKeyConstraint implements ITargetedConstraintBase {
           @AllowedValue(value = "WARNING",
               description = "A violation of the constraint represents a potential issue with the content."),
           @AllowedValue(value = "INFORMATIONAL",
-              description = "A violation of the constraint represents a point of interest.") })))
+              description = "A violation of the constraint represents a point of interest."),
+          @AllowedValue(value = "DEBUG",
+              description = "A violation of the constraint represents a fault in the content that may warrant review by a developer when performing model or tool development.") })))
   private String _level;
 
   @BoundFlag(
@@ -111,7 +117,7 @@ public class TargetedIndexHasKeyConstraint implements ITargetedConstraintBase {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundAssembly(
@@ -119,7 +125,7 @@ public class TargetedIndexHasKeyConstraint implements ITargetedConstraintBase {
       useName = "key-field",
       minOccurs = 1,
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "key-fields", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "key-fields", inJson = JsonGroupAsBehavior.LIST))
   private List<KeyConstraintField> _keyFields;
 
   @BoundField(
@@ -128,6 +134,19 @@ public class TargetedIndexHasKeyConstraint implements ITargetedConstraintBase {
       useName = "remarks")
   private Remarks _remarks;
 
+  public TargetedIndexHasKeyConstraint() {
+    this(null);
+  }
+
+  public TargetedIndexHasKeyConstraint(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getId() {
     return _id;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedIsUniqueConstraint.java
similarity index 89%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedIsUniqueConstraint.java
index c4cc2e4b9..4e30d1bd8 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedIsUniqueConstraint.java
@@ -24,12 +24,14 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -57,7 +59,9 @@
     formalName = "Targeted Unique Constraint",
     name = "targeted-is-unique-constraint",
     moduleClass = MetaschemaModelModule.class)
-public class TargetedIsUniqueConstraint implements ITargetedConstraintBase {
+public final class TargetedIsUniqueConstraint implements IBoundObject, ITargetedConstraintBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Constraint Identifier",
       name = "id",
@@ -77,7 +81,9 @@ public class TargetedIsUniqueConstraint implements ITargetedConstraintBase {
           @AllowedValue(value = "WARNING",
               description = "A violation of the constraint represents a potential issue with the content."),
           @AllowedValue(value = "INFORMATIONAL",
-              description = "A violation of the constraint represents a point of interest.") })))
+              description = "A violation of the constraint represents a point of interest."),
+          @AllowedValue(value = "DEBUG",
+              description = "A violation of the constraint represents a fault in the content that may warrant review by a developer when performing model or tool development.") })))
   private String _level;
 
   @BoundFlag(
@@ -104,7 +110,7 @@ public class TargetedIsUniqueConstraint implements ITargetedConstraintBase {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundAssembly(
@@ -112,7 +118,7 @@ public class TargetedIsUniqueConstraint implements ITargetedConstraintBase {
       useName = "key-field",
       minOccurs = 1,
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "key-fields", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "key-fields", inJson = JsonGroupAsBehavior.LIST))
   private List<KeyConstraintField> _keyFields;
 
   @BoundField(
@@ -121,6 +127,19 @@ public class TargetedIsUniqueConstraint implements ITargetedConstraintBase {
       useName = "remarks")
   private Remarks _remarks;
 
+  public TargetedIsUniqueConstraint() {
+    this(null);
+  }
+
+  public TargetedIsUniqueConstraint(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getId() {
     return _id;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedMatchesConstraint.java
similarity index 91%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedMatchesConstraint.java
index 3eaa1a743..7080fc363 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/TargetedMatchesConstraint.java
@@ -24,12 +24,14 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.StringAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLineAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraint;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
@@ -57,7 +59,9 @@
     formalName = "Value Matches Constraint",
     name = "targeted-matches-constraint",
     moduleClass = MetaschemaModelModule.class)
-public class TargetedMatchesConstraint implements ITargetedConstraintBase {
+public final class TargetedMatchesConstraint implements IBoundObject, ITargetedConstraintBase {
+  private final IMetaschemaData __metaschemaData;
+
   @BoundFlag(
       formalName = "Constraint Identifier",
       name = "id",
@@ -77,7 +81,9 @@ public class TargetedMatchesConstraint implements ITargetedConstraintBase {
           @AllowedValue(value = "WARNING",
               description = "A violation of the constraint represents a potential issue with the content."),
           @AllowedValue(value = "INFORMATIONAL",
-              description = "A violation of the constraint represents a point of interest.") })))
+              description = "A violation of the constraint represents a point of interest."),
+          @AllowedValue(value = "DEBUG",
+              description = "A violation of the constraint represents a fault in the content that may warrant review by a developer when performing model or tool development.") })))
   private String _level;
 
   @BoundFlag(
@@ -134,7 +140,7 @@ public class TargetedMatchesConstraint implements ITargetedConstraintBase {
       formalName = "Property",
       useName = "prop",
       maxOccurs = -1,
-      groupAs = @GroupAs(name = "props", namespace = "##default", inJson = JsonGroupAsBehavior.LIST))
+      groupAs = @GroupAs(name = "props", inJson = JsonGroupAsBehavior.LIST))
   private List<Property> _props;
 
   @BoundField(
@@ -143,6 +149,19 @@ public class TargetedMatchesConstraint implements ITargetedConstraintBase {
       useName = "remarks")
   private Remarks _remarks;
 
+  public TargetedMatchesConstraint() {
+    this(null);
+  }
+
+  public TargetedMatchesConstraint(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   @Override
   public String getId() {
     return _id;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/UseName.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/UseName.java
similarity index 86%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/UseName.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/UseName.java
index 9b78f0853..e5defee6b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/UseName.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/UseName.java
@@ -24,19 +24,21 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField;
-import java.lang.Override;
-import java.lang.String;
-import java.math.BigInteger;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.math.BigInteger;
+
 /**
  * Allows the name of the definition to be overridden.
  */
@@ -49,7 +51,9 @@
     description = "Allows the name of the definition to be overridden.",
     name = "use-name",
     moduleClass = MetaschemaModelModule.class)
-public class UseName {
+public final class UseName implements IBoundObject {
+  private final IMetaschemaData __metaschemaData;
+
   /**
    * "Used for binary formats instead of the textual name."
    */
@@ -65,6 +69,19 @@ public class UseName {
       typeAdapter = TokenAdapter.class)
   private String _name;
 
+  public UseName() {
+    this(null);
+  }
+
+  public UseName(IMetaschemaData data) {
+    this.__metaschemaData = data;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return __metaschemaData;
+  }
+
   public BigInteger getIndex() {
     return _index;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/package-info.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/package-info.java
similarity index 93%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/package-info.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/package-info.java
index f0b9eef72..d3aad0b4a 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/binding/package-info.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/package-info.java
@@ -24,10 +24,15 @@
  * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
+
+/**
+ * A Metaschema module represented as a set of Metaschema module bindings.
+ */
+
 @gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaPackage(moduleClass = { MetaschemaModelModule.class })
 @gov.nist.secauto.metaschema.databind.model.annotations.XmlSchema(
     namespace = "http://csrc.nist.gov/ns/oscal/metaschema/1.0",
     xmlns = { @gov.nist.secauto.metaschema.databind.model.annotations.XmlNs(prefix = "",
         namespace = "http://csrc.nist.gov/ns/oscal/metaschema/1.0") },
     xmlElementFormDefault = gov.nist.secauto.metaschema.databind.model.annotations.XmlNsForm.QUALIFIED)
-package gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+package gov.nist.secauto.metaschema.databind.model.binding.metaschema;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java
index 64d613e47..d84a7406b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java
@@ -26,46 +26,53 @@
 
 package gov.nist.secauto.metaschema.databind.model.impl;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 import gov.nist.secauto.metaschema.databind.model.IBoundModule;
-import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public abstract class AbstractBoundDefinitionModelComplex<A extends Annotation>
-    implements IFeatureBoundContainerFlag, IBoundDefinitionModelComplex {
+    implements IBoundDefinitionModelComplex {
   @NonNull
-  private final Class<?> clazz;
+  private final Class<? extends IBoundObject> clazz;
   @NonNull
   private final A annotation;
   @NonNull
   private final IBindingContext bindingContext;
   @NonNull
   private final Lazy<IBoundModule> module;
+  @NonNull
+  private final Lazy<QName> qname;
+  @NonNull
+  private final Lazy<QName> definitionQName;
   @Nullable
   private final Method beforeDeserializeMethod;
   @Nullable
   private final Method afterDeserializeMethod;
 
   protected AbstractBoundDefinitionModelComplex(
-      @NonNull Class<?> clazz,
-      @NonNull Class<A> annotationClass,
+      @NonNull Class<? extends IBoundObject> clazz,
+      @NonNull A annotation,
+      @NonNull Class<? extends IBoundModule> moduleClass,
       @NonNull IBindingContext bindingContext) {
     this.clazz = clazz;
-    this.annotation = ModelUtil.getAnnotation(clazz, annotationClass);
+    this.annotation = annotation;
     this.bindingContext = bindingContext;
-    this.module = ObjectUtils.notNull(Lazy.lazy(() -> bindingContext.registerModule(getModuleClass())));
+    this.module = ObjectUtils.notNull(Lazy.lazy(() -> bindingContext.registerModule(moduleClass)));
+    this.qname = ObjectUtils.notNull(Lazy.lazy(() -> getContainingModule().toModelQName(getEffectiveName())));
+    this.definitionQName = ObjectUtils.notNull(Lazy.lazy(() -> getContainingModule().toModelQName(getName())));
     this.beforeDeserializeMethod = ClassIntrospector.getMatchingMethod(
         clazz,
         "beforeDeserialize",
@@ -76,11 +83,8 @@ protected AbstractBoundDefinitionModelComplex(
         Object.class);
   }
 
-  @NonNull
-  protected abstract Class<? extends IBoundModule> getModuleClass();
-
   @Override
-  public Class<?> getBoundClass() {
+  public Class<? extends IBoundObject> getBoundClass() {
     return clazz;
   }
 
@@ -88,11 +92,6 @@ public A getAnnotation() {
     return annotation;
   }
 
-  @Override
-  public boolean isInline() {
-    return getBoundClass().getEnclosingClass() != null;
-  }
-
   @Override
   @NonNull
   public IBoundModule getContainingModule() {
@@ -105,82 +104,31 @@ public IBindingContext getBindingContext() {
     return bindingContext;
   }
 
-  /**
-   * Gets a new instance of the bound class.
-   *
-   * @param <CLASS>
-   *          the type of the bound class
-   * @return a Java object for the class
-   * @throws RuntimeException
-   *           if the instance cannot be created due to a binding error
-   */
-  @SuppressWarnings("PMD.AvoidThrowingRawExceptionTypes")
+  @SuppressWarnings("null")
   @Override
-  @NonNull
-  public <CLASS> CLASS newInstance() {
-    Class<?> clazz = getBoundClass();
-    try {
-      @SuppressWarnings("unchecked") Constructor<CLASS> constructor
-          = (Constructor<CLASS>) clazz.getDeclaredConstructor();
-      return ObjectUtils.notNull(constructor.newInstance());
-    } catch (NoSuchMethodException ex) {
-      String msg = String.format("Class '%s' does not have a required no-arg constructor.", clazz.getName());
-      throw new RuntimeException(msg, ex);
-    } catch (InstantiationException | IllegalAccessException | InvocationTargetException ex) {
-      throw new RuntimeException(ex);
-    }
+  public final QName getXmlQName() {
+    return qname.get();
   }
 
-  /**
-   * Calls the method named "beforeDeserialize" on each class in the object's
-   * hierarchy if the method exists on the class.
-   * <p>
-   * These methods can be used to set the initial state of the target bound object
-   * before data is read and applied during deserialization.
-   *
-   * @param targetObject
-   *          the data object target to call the method(s) on
-   * @param parentObject
-   *          the object target's parent object, which is used as the method
-   *          argument
-   * @throws BindingException
-   *           if an error occurs while calling the method
-   */
+  @SuppressWarnings("null")
   @Override
-  public void callBeforeDeserialize(Object targetObject, Object parentObject) throws BindingException {
-    if (beforeDeserializeMethod != null) {
-      try {
-        beforeDeserializeMethod.invoke(targetObject, parentObject);
-      } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
-        throw new BindingException(ex);
-      }
-    }
+  public final QName getDefinitionQName() {
+    return definitionQName.get();
   }
 
-  /**
-   * Calls the method named "afterDeserialize" on each class in the object's
-   * hierarchy if the method exists.
-   * <p>
-   * These methods can be used to modify the state of the target bound object
-   * after data is read and applied during deserialization.
-   *
-   * @param targetObject
-   *          the data object target to call the method(s) on
-   * @param parentObject
-   *          the object target's parent object, which is used as the method
-   *          argument
-   * @throws BindingException
-   *           if an error occurs while calling the method
-   */
   @Override
-  public void callAfterDeserialize(Object targetObject, Object parentObject) throws BindingException {
-    if (afterDeserializeMethod != null) {
-      try {
-        afterDeserializeMethod.invoke(targetObject, parentObject);
-      } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
-        throw new BindingException(ex);
-      }
-    }
+  public boolean isInline() {
+    return getBoundClass().getEnclosingClass() != null;
+  }
+
+  @Override
+  public Method getBeforeDeserializeMethod() {
+    return beforeDeserializeMethod;
+  }
+
+  @Override
+  public Method getAfterDeserializeMethod() {
+    return afterDeserializeMethod;
   }
 
   // @Override
@@ -190,8 +138,8 @@ public void callAfterDeserialize(Object targetObject, Object parentObject) throw
   // }
 
   @Override
-  public Object deepCopyItem(Object item, Object parentInstance) throws BindingException {
-    Object instance = newInstance();
+  public IBoundObject deepCopyItem(IBoundObject item, IBoundObject parentInstance) throws BindingException {
+    IBoundObject instance = newInstance(item::getMetaschemaData);
 
     callBeforeDeserialize(instance, parentInstance);
 
@@ -202,7 +150,7 @@ public Object deepCopyItem(Object item, Object parentInstance) throws BindingExc
     return instance;
   }
 
-  protected void deepCopyItemInternal(@NonNull Object fromObject, @NonNull Object toObject)
+  protected void deepCopyItemInternal(@NonNull IBoundObject fromObject, @NonNull IBoundObject toObject)
       throws BindingException {
     for (IBoundInstanceFlag instance : getFlagInstances()) {
       instance.deepCopy(fromObject, toObject);
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceField.java
deleted file mode 100644
index d5913d8ea..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceField.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.impl;
-
-import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
-import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelField;
-import gov.nist.secauto.metaschema.databind.model.IGroupAs;
-import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
-import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
-import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
-
-import java.lang.reflect.Field;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-// TODO: implement getProperties()
-public abstract class AbstractBoundInstanceField
-    extends AbstractBoundInstanceModelJavaField<BoundField>
-    implements IBoundInstanceModelField {
-  @NonNull
-  private final IGroupAs groupAs;
-
-  /**
-   * Construct a new field instance bound to a Java field.
-   *
-   * @param javaField
-   *          the Java field bound to this instance
-   * @param containingDefinition
-   *          the definition containing this instance
-   */
-  protected AbstractBoundInstanceField(
-      @NonNull Field javaField,
-      @NonNull IBoundDefinitionModelAssembly containingDefinition) {
-    super(javaField, BoundField.class, containingDefinition);
-    this.groupAs = ModelUtil.groupAs(getAnnotation().groupAs());
-    if (getMaxOccurs() == -1 || getMaxOccurs() > 1) {
-      if (IGroupAs.SINGLETON_GROUP_AS.equals(this.groupAs)) {
-        throw new IllegalStateException(String.format("Field '%s' on class '%s' is missing the '%s' annotation.",
-            javaField.getName(),
-            javaField.getDeclaringClass().getName(),
-            GroupAs.class.getName())); // NOPMD false positive
-      }
-    } else if (!IGroupAs.SINGLETON_GROUP_AS.equals(this.groupAs)) {
-      // max is 1 and a groupAs is set
-      throw new IllegalStateException(
-          String.format(
-              "Field '%s' on class '%s' has the '%s' annotation, but maxOccurs=1. A groupAs must not be specfied.",
-              javaField.getName(),
-              javaField.getDeclaringClass().getName(),
-              GroupAs.class.getName())); // NOPMD false positive
-    }
-  }
-
-  // ------------------------------------------
-  // - Start annotation driven code - CPD-OFF -
-  // ------------------------------------------
-
-  @Override
-  public IGroupAs getGroupAs() {
-    return groupAs;
-  }
-
-  @Override
-  public String getFormalName() {
-    return ModelUtil.resolveNoneOrValue(getAnnotation().formalName());
-  }
-
-  @Override
-  public MarkupLine getDescription() {
-    return ModelUtil.resolveToMarkupLine(getAnnotation().description());
-  }
-
-  @Override
-  public Integer getUseIndex() {
-    int value = getAnnotation().useIndex();
-    return value == Integer.MIN_VALUE ? null : value;
-  }
-
-  @Override
-  public boolean isInXmlWrapped() {
-    return getAnnotation().inXmlWrapped();
-  }
-
-  @Override
-  public final int getMinOccurs() {
-    return getAnnotation().minOccurs();
-  }
-
-  @Override
-  public final int getMaxOccurs() {
-    return getAnnotation().maxOccurs();
-  }
-
-  @Override
-  public MarkupMultiline getRemarks() {
-    return ModelUtil.resolveToMarkupMultiline(getAnnotation().remarks());
-  }
-
-  // @Override
-  // public String getJsonKeyFlagName() {
-  // return IBoundInstanceModelField.super.getJsonKeyFlagName();
-  // }
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceModelGroupedNamed.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceModelGroupedNamed.java
deleted file mode 100644
index 980e4b371..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundInstanceModelGroupedNamed.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.impl;
-
-import gov.nist.secauto.metaschema.databind.io.BindingException;
-import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedNamed;
-
-import java.lang.annotation.Annotation;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-//TODO: implement getProperties()
-public abstract class AbstractBoundInstanceModelGroupedNamed<
-    A extends Annotation>
-    implements IBoundInstanceModelGroupedNamed {
-  @NonNull
-  private final A annotation;
-  @NonNull
-  private final IBoundInstanceModelChoiceGroup choiceGroupInstance;
-
-  protected AbstractBoundInstanceModelGroupedNamed(
-      @NonNull A annotation,
-      @NonNull IBoundInstanceModelChoiceGroup choiceGroupInstance) {
-    this.annotation = annotation;
-    this.choiceGroupInstance = choiceGroupInstance;
-  }
-
-  public A getAnnotation() {
-    return annotation;
-  }
-
-  @Override
-  public IBoundInstanceModelChoiceGroup getParentContainer() {
-    return choiceGroupInstance;
-  }
-
-  @Override
-  public IBoundDefinitionModelAssembly getContainingDefinition() {
-    return getParentContainer().getContainingDefinition();
-  }
-
-  @Override
-  public String getJsonKeyFlagName() {
-    return getParentContainer().getJsonKeyFlagName();
-  }
-
-  @Override
-  public String getName() {
-    return getDefinition().getName();
-  }
-
-  @Override
-  public Object deepCopyItem(Object item, Object parentInstance) throws BindingException {
-    return getDefinition().deepCopyItem(item, parentInstance);
-  }
-
-  @Override
-  public void callBeforeDeserialize(Object targetObject, Object parentObject) throws BindingException {
-    getDefinition().callBeforeDeserialize(targetObject, parentObject);
-  }
-
-  @Override
-  public void callAfterDeserialize(Object targetObject, Object parentObject) throws BindingException {
-    getDefinition().callAfterDeserialize(targetObject, parentObject);
-  }
-
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AssemblyModelContainerSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AssemblyModelContainerSupport.java
index af2074036..faeeeb4ca 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AssemblyModelContainerSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AssemblyModelContainerSupport.java
@@ -51,46 +51,50 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 class AssemblyModelContainerSupport
     implements IContainerModelAssemblySupport<
-        IBoundInstanceModel,
-        IBoundInstanceModelNamed,
-        IBoundInstanceModelField,
+        IBoundInstanceModel<?>,
+        IBoundInstanceModelNamed<?>,
+        IBoundInstanceModelField<?>,
         IBoundInstanceModelAssembly,
         IChoiceInstance,
         IBoundInstanceModelChoiceGroup> {
   @NonNull
-  private final List<IBoundInstanceModel> modelInstances;
+  private final List<IBoundInstanceModel<?>> modelInstances;
   @NonNull
-  private final Map<String, IBoundInstanceModelNamed> namedModelInstances;
+  private final Map<QName, IBoundInstanceModelNamed<?>> namedModelInstances;
   @NonNull
-  private final Map<String, IBoundInstanceModelField> fieldInstances;
+  private final Map<QName, IBoundInstanceModelField<?>> fieldInstances;
   @NonNull
-  private final Map<String, IBoundInstanceModelAssembly> assemblyInstances;
+  private final Map<QName, IBoundInstanceModelAssembly> assemblyInstances;
   @NonNull
   private final Map<String, IBoundInstanceModelChoiceGroup> choiceGroupInstances;
 
   @SuppressWarnings("PMD.UseConcurrentHashMap")
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public AssemblyModelContainerSupport(
       @NonNull DefinitionAssembly containingDefinition) {
     this.modelInstances = CollectionUtil.unmodifiableList(ObjectUtils.notNull(
         getModelInstanceStream(containingDefinition, containingDefinition.getBoundClass())
             .collect(Collectors.toUnmodifiableList())));
 
-    Map<String, IBoundInstanceModelNamed> namedModelInstances = new LinkedHashMap<>();
-    Map<String, IBoundInstanceModelField> fieldInstances = new LinkedHashMap<>();
-    Map<String, IBoundInstanceModelAssembly> assemblyInstances = new LinkedHashMap<>();
+    Map<QName, IBoundInstanceModelNamed<?>> namedModelInstances = new LinkedHashMap<>();
+    Map<QName, IBoundInstanceModelField<?>> fieldInstances = new LinkedHashMap<>();
+    Map<QName, IBoundInstanceModelAssembly> assemblyInstances = new LinkedHashMap<>();
     Map<String, IBoundInstanceModelChoiceGroup> choiceGroupInstances = new LinkedHashMap<>();
-    for (IBoundInstanceModel instance : this.modelInstances) {
+    for (IBoundInstanceModel<?> instance : this.modelInstances) {
       if (instance instanceof IBoundInstanceModelNamed) {
-        IBoundInstanceModelNamed named = (IBoundInstanceModelNamed) instance;
-        String key = named.getEffectiveName();
+        IBoundInstanceModelNamed<?> named = (IBoundInstanceModelNamed<?>) instance;
+        QName key = named.getXmlQName();
         namedModelInstances.put(key, named);
 
         if (instance instanceof IBoundInstanceModelField) {
-          fieldInstances.put(key, (IBoundInstanceModelField) named);
+          fieldInstances.put(key, (IBoundInstanceModelField<?>) named);
         } else if (instance instanceof IBoundInstanceModelAssembly) {
           assemblyInstances.put(key, (IBoundInstanceModelAssembly) named);
         }
@@ -115,10 +119,10 @@ public AssemblyModelContainerSupport(
         : CollectionUtil.unmodifiableMap(choiceGroupInstances);
   }
 
-  protected static IBoundInstanceModel newBoundModelInstance(
+  protected static IBoundInstanceModel<?> newBoundModelInstance(
       @NonNull Field field,
       @NonNull IBoundDefinitionModelAssembly definition) {
-    IBoundInstanceModel retval = null;
+    IBoundInstanceModel<?> retval = null;
     if (field.isAnnotationPresent(BoundAssembly.class)) {
       retval = IBoundInstanceModelAssembly.newInstance(field, definition);
     } else if (field.isAnnotationPresent(BoundField.class)) {
@@ -130,11 +134,11 @@ protected static IBoundInstanceModel newBoundModelInstance(
   }
 
   @NonNull
-  protected static Stream<IBoundInstanceModel> getModelInstanceStream(
+  protected static Stream<IBoundInstanceModel<?>> getModelInstanceStream(
       @NonNull IBoundDefinitionModelAssembly definition,
       @NonNull Class<?> clazz) {
 
-    Stream<IBoundInstanceModel> superInstances;
+    Stream<IBoundInstanceModel<?>> superInstances;
     Class<?> superClass = clazz.getSuperclass();
     if (superClass == null) {
       superInstances = Stream.empty();
@@ -153,7 +157,7 @@ protected static Stream<IBoundInstanceModel> getModelInstanceStream(
         .map(field -> {
           assert field != null;
 
-          IBoundInstanceModel retval = newBoundModelInstance(field, definition);
+          IBoundInstanceModel<?> retval = newBoundModelInstance(field, definition);
           if (retval == null) {
             throw new IllegalStateException(
                 String.format("The field '%s' on class '%s' is not bound", field.getName(), clazz.getName()));
@@ -164,22 +168,22 @@ protected static Stream<IBoundInstanceModel> getModelInstanceStream(
   }
 
   @Override
-  public Collection<IBoundInstanceModel> getModelInstances() {
+  public Collection<IBoundInstanceModel<?>> getModelInstances() {
     return modelInstances;
   }
 
   @Override
-  public Map<String, IBoundInstanceModelNamed> getNamedModelInstanceMap() {
+  public Map<QName, IBoundInstanceModelNamed<?>> getNamedModelInstanceMap() {
     return namedModelInstances;
   }
 
   @Override
-  public Map<String, IBoundInstanceModelField> getFieldInstanceMap() {
+  public Map<QName, IBoundInstanceModelField<?>> getFieldInstanceMap() {
     return fieldInstances;
   }
 
   @Override
-  public Map<String, IBoundInstanceModelAssembly> getAssemblyInstanceMap() {
+  public Map<QName, IBoundInstanceModelAssembly> getAssemblyInstanceMap() {
     return assemblyInstances;
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ClassIntrospector.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ClassIntrospector.java
index 5269fdb73..ff7204587 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ClassIntrospector.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ClassIntrospector.java
@@ -1,71 +1,71 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.impl;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-public final class ClassIntrospector {
-  private ClassIntrospector() {
-    // disable construction
-  }
-
-  @SuppressWarnings("PMD.EmptyCatchBlock")
-  public static List<Method> getMatchingMethods(Class<?> clazz, String name, Class<?>... parameterTypes) {
-    List<Method> retval = new LinkedList<>();
-    Class<?> searchClass = clazz;
-    do {
-      try {
-        Method method = searchClass.getDeclaredMethod(name, parameterTypes);
-        retval.add(method);
-      } catch (NoSuchMethodException ex) {
-        // do nothing, no matching method was found
-      }
-    } while ((searchClass = searchClass.getSuperclass()) != null);
-
-    return retval.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(retval);
-  }
-
-  @SuppressWarnings("PMD.EmptyCatchBlock")
-  public static Method getMatchingMethod(Class<?> clazz, String name, Class<?>... parameterTypes) {
-    Method retval = null;
-    Class<?> searchClass = clazz;
-    do {
-      try {
-        retval = searchClass.getDeclaredMethod(name, parameterTypes);
-        // stop on first found method
-        break;
-      } catch (NoSuchMethodException ex) {
-        // do nothing, no matching method was found
-      }
-    } while ((searchClass = searchClass.getSuperclass()) != null);
-
-    return retval;
-  }
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.model.impl;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+public final class ClassIntrospector {
+  private ClassIntrospector() {
+    // disable construction
+  }
+
+  @SuppressWarnings("PMD.EmptyCatchBlock")
+  public static List<Method> getMatchingMethods(Class<?> clazz, String name, Class<?>... parameterTypes) {
+    List<Method> retval = new LinkedList<>();
+    Class<?> searchClass = clazz;
+    do {
+      try {
+        Method method = searchClass.getDeclaredMethod(name, parameterTypes);
+        retval.add(method);
+      } catch (NoSuchMethodException ex) {
+        // do nothing, no matching method was found
+      }
+    } while ((searchClass = searchClass.getSuperclass()) != null);
+
+    return retval.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(retval);
+  }
+
+  @SuppressWarnings("PMD.EmptyCatchBlock")
+  public static Method getMatchingMethod(Class<?> clazz, String name, Class<?>... parameterTypes) {
+    Method retval = null;
+    Class<?> searchClass = clazz;
+    do {
+      try {
+        retval = searchClass.getDeclaredMethod(name, parameterTypes);
+        // stop on first found method
+        break;
+      } catch (NoSuchMethodException ex) {
+        // do nothing, no matching method was found
+      }
+    } while ((searchClass = searchClass.getSuperclass()) != null);
+
+    return retval;
+  }
+}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintFactory.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintFactory.java
index 0537af11a..97c8a24c6 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintFactory.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintFactory.java
@@ -30,7 +30,6 @@
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.constraint.AbstractConstraintBuilder;
 import gov.nist.secauto.metaschema.core.model.constraint.AbstractKeyConstraintBuilder;
@@ -68,6 +67,8 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -83,7 +84,7 @@ static MarkupMultiline toRemarks(@NonNull String remarks) {
   }
 
   @NonNull
-  static MetapathExpression toMetapath(@NonNull String metapath) {
+  static String toMetapath(@NonNull String metapath) {
     String path = metapath;
     if (path.startsWith("/")) {
       String newPath = "." + path;
@@ -95,12 +96,12 @@ static MetapathExpression toMetapath(@NonNull String metapath) {
             .append("' is not properly contextualized using '.'. Using '")
             .append(newPath)
             .append("' instead.");
-        LOGGER.atInfo().log(builder.toString());
+        LOGGER.atWarn().log(builder.toString());
       }
       path = newPath;
     }
 
-    return path.isBlank() ? IConstraint.DEFAULT_TARGET : MetapathExpression.compile(path);
+    return path.isBlank() ? IConstraint.DEFAULT_TARGET_METAPATH : path;
   }
 
   @NonNull
@@ -204,7 +205,7 @@ static IAllowedValuesConstraint newAllowedValuesConstraint(
     applyRemarks(builder, constraint.remarks());
 
     applyAllowedValues(builder, constraint);
-    builder.allowedOther(constraint.allowOthers());
+    builder.allowsOther(constraint.allowOthers());
     builder.extensible(constraint.extensible());
 
     return builder.build();
@@ -270,7 +271,7 @@ static IUniqueConstraint newUniqueConstraint(@NonNull IsUnique constraint, @NonN
 
   @NonNull
   static IIndexConstraint newIndexConstraint(@NonNull Index constraint, @NonNull ISource source) {
-    IIndexConstraint.Builder builder = IIndexConstraint.builder();
+    IIndexConstraint.Builder builder = IIndexConstraint.builder(constraint.name());
     applyId(builder, constraint.id());
     applyFormalName(builder, constraint.formalName());
     applyDescription(builder, constraint.description());
@@ -281,7 +282,6 @@ static IIndexConstraint newIndexConstraint(@NonNull Index constraint, @NonNull I
     applyProperties(builder, constraint.properties());
     applyRemarks(builder, constraint.remarks());
 
-    builder.name(constraint.name());
     applyKeyFields(builder, constraint.keyFields());
 
     return builder.build();
@@ -291,7 +291,7 @@ static IIndexConstraint newIndexConstraint(@NonNull Index constraint, @NonNull I
   static IIndexHasKeyConstraint newIndexHasKeyConstraint(
       @NonNull IndexHasKey constraint,
       @NonNull ISource source) {
-    IIndexHasKeyConstraint.Builder builder = IIndexHasKeyConstraint.builder();
+    IIndexHasKeyConstraint.Builder builder = IIndexHasKeyConstraint.builder(constraint.indexName());
     applyId(builder, constraint.id());
     applyFormalName(builder, constraint.formalName());
     applyDescription(builder, constraint.description());
@@ -302,7 +302,6 @@ static IIndexHasKeyConstraint newIndexHasKeyConstraint(
     applyProperties(builder, constraint.properties());
     applyRemarks(builder, constraint.remarks());
 
-    builder.name(constraint.indexName());
     applyKeyFields(builder, constraint.keyFields());
 
     return builder.build();
@@ -364,6 +363,6 @@ static ICardinalityConstraint newCardinalityConstraint(@NonNull HasCardinality c
 
   @NonNull
   static ILet newLetExpression(@NonNull Let annotation, @NonNull ISource source) {
-    return ILet.of(annotation.name(), annotation.target(), source);
+    return ILet.of(new QName(annotation.name()), annotation.target(), source);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintSupport.java
index fad12f9f4..eb69d743a 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/ConstraintSupport.java
@@ -63,19 +63,19 @@ public static void parse( // NOPMD - intentional
       try {
         Arrays.stream(valueAnnotation.lets())
             .map(annotation -> ConstraintFactory.newLetExpression(annotation, source))
-            .forEachOrdered(let -> set.addLetExpression(let));
+            .forEachOrdered(set::addLetExpression);
         Arrays.stream(valueAnnotation.allowedValues())
             .map(annotation -> ConstraintFactory.newAllowedValuesConstraint(annotation, source))
-            .forEachOrdered(constraint -> set.addConstraint(constraint));
+            .forEachOrdered(set::addConstraint);
         Arrays.stream(valueAnnotation.matches())
             .map(annotation -> ConstraintFactory.newMatchesConstraint(annotation, source))
-            .forEachOrdered(constraint -> set.addConstraint(constraint));
+            .forEachOrdered(set::addConstraint);
         Arrays.stream(valueAnnotation.indexHasKey())
             .map(annotation -> ConstraintFactory.newIndexHasKeyConstraint(annotation, source))
-            .forEachOrdered(constraint -> set.addConstraint(constraint));
+            .forEachOrdered(set::addConstraint);
         Arrays.stream(valueAnnotation.expect())
             .map(annotation -> ConstraintFactory.newExpectConstraint(annotation, source))
-            .forEachOrdered(constraint -> set.addConstraint(constraint));
+            .forEachOrdered(set::addConstraint);
       } catch (MetapathException ex) {
         throw new MetapathException(
             String.format("Unable to compile a Metapath in '%s'. %s", source.getSource(), ex.getLocalizedMessage()),
@@ -104,15 +104,15 @@ public static void parse( // NOPMD - intentional
       try {
         Arrays.stream(assemblyAnnotation.index())
             .map(annotation -> ConstraintFactory.newIndexConstraint(annotation, source))
-            .forEachOrdered(constraint -> set.addConstraint(constraint));
+            .forEachOrdered(set::addConstraint);
 
         Arrays.stream(assemblyAnnotation.unique())
             .map(annotation -> ConstraintFactory.newUniqueConstraint(annotation, source))
-            .forEachOrdered(constraint -> set.addConstraint(constraint));
+            .forEachOrdered(set::addConstraint);
 
         Arrays.stream(assemblyAnnotation.cardinality())
             .map(annotation -> ConstraintFactory.newCardinalityConstraint(annotation, source))
-            .forEachOrdered(constraint -> set.addConstraint(constraint));
+            .forEachOrdered(set::addConstraint);
       } catch (MetapathException ex) {
         throw new MetapathException(
             String.format("Unable to compile a Metapath in '%s'. %s", source.getSource(), ex.getLocalizedMessage()),
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/DefaultGroupAs.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefaultGroupAs.java
similarity index 70%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/DefaultGroupAs.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefaultGroupAs.java
index c7a635b99..185f2dc00 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/annotations/DefaultGroupAs.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefaultGroupAs.java
@@ -24,46 +24,44 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.annotations;
+package gov.nist.secauto.metaschema.databind.model.impl;
 
+import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior;
 import gov.nist.secauto.metaschema.databind.model.IGroupAs;
+import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
+import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
+
+import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-class DefaultGroupAs implements IGroupAs {
+public class DefaultGroupAs implements IGroupAs {
   @NonNull
-  private final String name;
-  @Nullable
-  private final String namespace;
+  private final QName qname;
   @NonNull
   private final GroupAs annotation;
 
-  DefaultGroupAs(@NonNull GroupAs annotation) {
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
+  public DefaultGroupAs(
+      @NonNull GroupAs annotation,
+      @NonNull IModule module) {
     this.annotation = annotation;
-    {
-      String value = ModelUtil.resolveNoneOrDefault(annotation.name(), null);
-      if (value == null) {
-        throw new IllegalStateException(
-            String.format("The %s#groupName value '%s' resulted in an invalid null value",
-                GroupAs.class.getName(),
-                annotation.name()));
-      }
-      this.name = value;
+    String value = ModelUtil.resolveNoneOrDefault(annotation.name(), null);
+    if (value == null) {
+      throw new IllegalStateException(
+          String.format("The %s#groupName value '%s' resulted in an invalid null value",
+              GroupAs.class.getName(),
+              annotation.name()));
     }
-    this.namespace = ModelUtil.resolveOptionalNamespace(annotation.namespace());
-  }
-
-  @Override
-  public String getGroupAsName() {
-    return name;
+    this.qname = module.toModelQName(value);
   }
 
   @Override
-  public String getGroupAsXmlNamespace() {
-    return namespace;
+  public QName getGroupAsQName() {
+    return qname;
   }
 
   @Override
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionAssembly.java
index 5516cdf16..9f8ec771a 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionAssembly.java
@@ -28,6 +28,7 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet;
 import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
@@ -35,7 +36,6 @@
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup;
@@ -57,15 +57,16 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 //TODO: implement getProperties()
-public class DefinitionAssembly
+public final class DefinitionAssembly
     extends AbstractBoundDefinitionModelComplex<MetaschemaAssembly>
     implements IBoundDefinitionModelAssembly,
     IFeatureBoundContainerModelAssembly<
-        IBoundInstanceModel,
-        IBoundInstanceModelNamed,
-        IBoundInstanceModelField,
+        IBoundInstanceModel<?>,
+        IBoundInstanceModelNamed<?>,
+        IBoundInstanceModelField<?>,
         IBoundInstanceModelAssembly,
         IBoundInstanceModelChoiceGroup> {
+
   @NonNull
   private final Lazy<FlagContainerSupport> flagContainer;
   @NonNull
@@ -75,25 +76,27 @@ public class DefinitionAssembly
   @NonNull
   private final Lazy<QName> xmlRootQName;
   @NonNull
-  private final Lazy<Map<String, IBoundProperty>> jsonProperties;
+  private final Lazy<Map<String, IBoundProperty<?>>> jsonProperties;
+
+  public static DefinitionAssembly newInstance(
+      @NonNull Class<? extends IBoundObject> clazz,
+      @NonNull IBindingContext bindingContext) {
+    MetaschemaAssembly annotation = ModelUtil.getAnnotation(clazz, MetaschemaAssembly.class);
+    Class<? extends IBoundModule> moduleClass = annotation.moduleClass();
+    return new DefinitionAssembly(clazz, annotation, moduleClass, bindingContext);
+  }
 
-  public DefinitionAssembly(
-      @NonNull Class<?> clazz,
+  private DefinitionAssembly(
+      @NonNull Class<? extends IBoundObject> clazz,
+      @NonNull MetaschemaAssembly annotation,
+      @NonNull Class<? extends IBoundModule> moduleClass,
       @NonNull IBindingContext bindingContext) {
-    super(clazz, MetaschemaAssembly.class, bindingContext);
+    super(clazz, annotation, moduleClass, bindingContext);
 
     String rootLocalName = ModelUtil.resolveNoneOrDefault(getAnnotation().rootName(), null);
-    this.xmlRootQName = ObjectUtils.notNull(Lazy.lazy(() -> {
-      QName retval = null;
-      if (rootLocalName != null) {
-        String namespace = ModelUtil.resolveOptionalNamespace(getAnnotation().rootNamespace());
-        if (namespace == null) {
-          namespace = getContainingModule().getXmlNamespace().toASCIIString();
-        }
-        retval = new QName(namespace, rootLocalName);
-      }
-      return retval;
-    }));
+    this.xmlRootQName = ObjectUtils.notNull(Lazy.lazy(() -> rootLocalName == null
+        ? null
+        : getContainingModule().toModelQName(rootLocalName)));
     this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> new FlagContainerSupport(this, null)));
     this.modelContainer = ObjectUtils.notNull(Lazy.lazy(() -> new AssemblyModelContainerSupport(this)));
     this.constraints = ObjectUtils.notNull(Lazy.lazy(() -> {
@@ -113,15 +116,20 @@ public DefinitionAssembly(
   }
 
   @Override
-  protected void deepCopyItemInternal(Object fromObject, Object toObject) throws BindingException {
+  protected void deepCopyItemInternal(IBoundObject fromObject, IBoundObject toObject) throws BindingException {
     // copy the flags
     super.deepCopyItemInternal(fromObject, toObject);
 
-    for (IBoundInstanceModel instance : getModelInstances()) {
+    for (IBoundInstanceModel<?> instance : getModelInstances()) {
       instance.deepCopy(fromObject, toObject);
     }
   }
 
+  @Override
+  public Map<String, IBoundProperty<?>> getJsonProperties() {
+    return ObjectUtils.notNull(jsonProperties.get());
+  }
+
   // ------------------------------------------
   // - Start annotation driven code - CPD-OFF -
   // ------------------------------------------
@@ -133,11 +141,6 @@ public FlagContainerSupport getFlagContainer() {
     return flagContainer.get();
   }
 
-  @Override
-  public IBoundInstanceFlag getJsonKeyFlagInstance() {
-    return getFlagContainer().getJsonKeyFlagInstance();
-  }
-
   @Override
   @SuppressWarnings("null")
   @NonNull
@@ -151,11 +154,6 @@ public IModelConstrained getConstraintSupport() {
     return ObjectUtils.notNull(constraints.get());
   }
 
-  @Override
-  public Map<String, IBoundProperty> getJsonProperties() {
-    return ObjectUtils.notNull(jsonProperties.get());
-  }
-
   @Override
   @Nullable
   public String getFormalName() {
@@ -177,7 +175,7 @@ public String getName() {
   @Override
   @Nullable
   public Integer getIndex() {
-    return ModelUtil.resolveNullOrInteger(getAnnotation().index());
+    return ModelUtil.resolveDefaultInteger(getAnnotation().index());
   }
 
   @Override
@@ -186,12 +184,6 @@ public MarkupMultiline getRemarks() {
     return ModelUtil.resolveToMarkupMultiline(getAnnotation().description());
   }
 
-  @Override
-  @NonNull
-  protected Class<? extends IBoundModule> getModuleClass() {
-    return getAnnotation().moduleClass();
-  }
-
   @Override
   @Nullable
   public QName getRootXmlQName() {
@@ -217,7 +209,7 @@ public String getRootName() {
   @Override
   @Nullable
   public Integer getRootIndex() {
-    return ModelUtil.resolveNullOrInteger(getAnnotation().rootIndex());
+    return ModelUtil.resolveDefaultInteger(getAnnotation().rootIndex());
   }
 
   // ----------------------------------------
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionField.java
index cec7806fb..3bba46ee1 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionField.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/DefinitionField.java
@@ -29,6 +29,7 @@
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet;
 import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
@@ -56,7 +57,7 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 //TODO: implement getProperties()
-public class DefinitionField
+public final class DefinitionField
     extends AbstractBoundDefinitionModelComplex<MetaschemaField>
     implements IBoundDefinitionModelFieldComplex {
   @NonNull
@@ -68,7 +69,7 @@ public class DefinitionField
   @NonNull
   private final Lazy<IValueConstrained> constraints;
   @NonNull
-  private final Lazy<Map<String, IBoundProperty>> jsonProperties;
+  private final Lazy<Map<String, IBoundProperty<?>>> jsonProperties;
 
   /**
    * Collect all fields that are part of the model for this class.
@@ -83,12 +84,7 @@ private static Field getFieldValueField(Class<?> clazz) {
 
     Field retval = null;
     for (Field field : fields) {
-      if (!field.isAnnotationPresent(BoundFieldValue.class)) {
-        // skip fields that aren't a field or assembly instance
-        continue;
-      }
-
-      if (field.isAnnotationPresent(Ignore.class)) {
+      if (!field.isAnnotationPresent(BoundFieldValue.class) || field.isAnnotationPresent(Ignore.class)) {
         // skip this field, since it is ignored
         continue;
       }
@@ -112,11 +108,23 @@ private static Field getFieldValueField(Class<?> clazz) {
    *          the Java class the definition is bound to
    * @param bindingContext
    *          the Metaschema binding context managing this class
+   * @return the instance
    */
-  public DefinitionField(
-      @NonNull Class<?> clazz,
+  @NonNull
+  public static DefinitionField newInstance(
+      @NonNull Class<? extends IBoundObject> clazz,
       @NonNull IBindingContext bindingContext) {
-    super(clazz, MetaschemaField.class, bindingContext);
+    MetaschemaField annotation = ModelUtil.getAnnotation(clazz, MetaschemaField.class);
+    Class<? extends IBoundModule> moduleClass = annotation.moduleClass();
+    return new DefinitionField(clazz, annotation, moduleClass, bindingContext);
+  }
+
+  private DefinitionField(
+      @NonNull Class<? extends IBoundObject> clazz,
+      @NonNull MetaschemaField annotation,
+      @NonNull Class<? extends IBoundModule> moduleClass,
+      @NonNull IBindingContext bindingContext) {
+    super(clazz, annotation, moduleClass, bindingContext);
     Field field = getFieldValueField(getBoundClass());
     if (field == null) {
       throw new IllegalArgumentException(
@@ -124,7 +132,7 @@ public DefinitionField(
               clazz.getName(),
               BoundFieldValue.class.getName())); // NOPMD false positive
     }
-    this.fieldValue = new FieldValue(field, BoundFieldValue.class);
+    this.fieldValue = new FieldValue(field, BoundFieldValue.class, bindingContext);
     this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> new FlagContainerSupport(this, this::handleFlagInstance)));
     this.constraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IModelConstrained retval = new AssemblyConstraintSet();
@@ -134,7 +142,7 @@ public DefinitionField(
     }));
     this.jsonProperties = ObjectUtils.notNull(Lazy.lazy(() -> {
       IBoundInstanceFlag jsonValueKey = getJsonValueKeyFlagInstance();
-      Predicate<IBoundInstanceFlag> flagFilter = jsonValueKey == null ? null : (flag) -> !flag.equals(jsonValueKey);
+      Predicate<IBoundInstanceFlag> flagFilter = jsonValueKey == null ? null : flag -> !flag.equals(jsonValueKey);
       return getJsonProperties(flagFilter);
     }));
   }
@@ -165,7 +173,7 @@ public IBoundInstanceFlag getJsonValueKeyFlagInstance() {
   }
 
   @Override
-  protected void deepCopyItemInternal(Object fromObject, Object toObject) throws BindingException {
+  protected void deepCopyItemInternal(IBoundObject fromObject, IBoundObject toObject) throws BindingException {
     // copy the flags
     super.deepCopyItemInternal(fromObject, toObject);
 
@@ -183,11 +191,6 @@ public FlagContainerSupport getFlagContainer() {
     return flagContainer.get();
   }
 
-  @Override
-  public IBoundInstanceFlag getJsonKeyFlagInstance() {
-    return getFlagContainer().getJsonKeyFlagInstance();
-  }
-
   @Override
   @NonNull
   public IValueConstrained getConstraintSupport() {
@@ -195,7 +198,7 @@ public IValueConstrained getConstraintSupport() {
   }
 
   @Override
-  public Map<String, IBoundProperty> getJsonProperties() {
+  public Map<String, IBoundProperty<?>> getJsonProperties() {
     return ObjectUtils.notNull(jsonProperties.get());
   }
 
@@ -220,7 +223,7 @@ public String getName() {
   @Override
   @Nullable
   public Integer getIndex() {
-    return ModelUtil.resolveNullOrInteger(getAnnotation().index());
+    return ModelUtil.resolveDefaultInteger(getAnnotation().index());
   }
 
   @Override
@@ -229,16 +232,13 @@ public MarkupMultiline getRemarks() {
     return ModelUtil.resolveToMarkupMultiline(getAnnotation().description());
   }
 
-  @Override
-  @NonNull
-  protected Class<? extends IBoundModule> getModuleClass() {
-    return getAnnotation().moduleClass();
-  }
-
   protected class FieldValue
-      extends AbstractBoundAnnotatedJavaField<BoundFieldValue>
       implements IBoundFieldValue {
     @NonNull
+    private final Field javaField;
+    @NonNull
+    private final BoundFieldValue annotation;
+    @NonNull
     private final IDataTypeAdapter<?> javaTypeAdapter;
     @Nullable
     private final Object defaultValue;
@@ -250,15 +250,40 @@ protected class FieldValue
      *          the Java field the field value is bound to
      * @param annotationClass
      *          the field value binding annotation Java class
+     * @param bindingContext
+     *          the Metaschema binding context managing this class
      */
     protected FieldValue(
         @NonNull Field javaField,
-        @NonNull Class<BoundFieldValue> annotationClass) {
-      super(javaField, annotationClass);
+        @NonNull Class<BoundFieldValue> annotationClass,
+        @NonNull IBindingContext bindingContext) {
+      this.javaField = javaField;
+      this.annotation = ModelUtil.getAnnotation(javaField, annotationClass);
       this.javaTypeAdapter = ModelUtil.getDataTypeAdapter(
-          getAnnotation().typeAdapter(),
-          getBindingContext());
-      this.defaultValue = ModelUtil.resolveNullOrValue(getAnnotation().defaultValue(), this.javaTypeAdapter);
+          this.annotation.typeAdapter(),
+          bindingContext);
+      this.defaultValue = ModelUtil.resolveDefaultValue(this.annotation.defaultValue(), this.javaTypeAdapter);
+    }
+
+    /**
+     * Get the bound Java field.
+     *
+     * @return the bound Java field
+     */
+    @Override
+    @NonNull
+    public Field getField() {
+      return javaField;
+    }
+
+    /**
+     * Get the binding Java annotation.
+     *
+     * @return the binding Java annotation
+     */
+    @NonNull
+    public BoundFieldValue getAnnotation() {
+      return annotation;
     }
 
     @Override
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/FlagContainerSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/FlagContainerSupport.java
index 7d73546b6..e6cdc5bea 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/FlagContainerSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/FlagContainerSupport.java
@@ -29,6 +29,7 @@
 import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.Ignore;
@@ -45,18 +46,22 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class FlagContainerSupport implements IContainerFlagSupport<IBoundInstanceFlag> {
   @NonNull
-  private final Map<String, IBoundInstanceFlag> flagInstances;
+  private final Map<QName, IBoundInstanceFlag> flagInstances;
   @Nullable
   private IBoundInstanceFlag jsonKeyFlag;
 
   @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public FlagContainerSupport(
-      @NonNull AbstractBoundDefinitionModelComplex<?> definition,
+      @NonNull IBoundDefinitionModelComplex definition,
       @Nullable Consumer<IBoundInstanceFlag> peeker) {
     Class<?> clazz = definition.getBoundClass();
 
@@ -80,7 +85,7 @@ public FlagContainerSupport(
     this.flagInstances = CollectionUtil.unmodifiableMap(ObjectUtils.notNull(instances
         .peek(intermediate)
         .collect(Collectors.toMap(
-            IBoundInstanceFlag::getEffectiveName,
+            IBoundInstanceFlag::getXmlQName,
             Function.identity(),
             (v1, v2) -> v2,
             LinkedHashMap::new))));
@@ -107,12 +112,7 @@ protected static Collection<Field> getFlagInstanceFields(Class<?> clazz) {
     }
 
     for (Field field : fields) {
-      if (!field.isAnnotationPresent(BoundFlag.class)) {
-        // skip non-flag fields
-        continue;
-      }
-
-      if (field.isAnnotationPresent(Ignore.class)) {
+      if (!field.isAnnotationPresent(BoundFlag.class) || field.isAnnotationPresent(Ignore.class)) {
         // skip this field, since it is ignored
         continue;
       }
@@ -136,10 +136,11 @@ protected void handleFlagInstance(IBoundInstanceFlag instance) {
 
   @Override
   @NonNull
-  public Map<String, IBoundInstanceFlag> getFlagInstanceMap() {
+  public Map<QName, IBoundInstanceFlag> getFlagInstanceMap() {
     return flagInstances;
   }
 
+  @Override
   public IBoundInstanceFlag getJsonKeyFlagInstance() {
     return jsonKeyFlag;
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureBoundContainerModelAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureBoundContainerModelAssembly.java
index a9f423051..1676e9ea7 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureBoundContainerModelAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureBoundContainerModelAssembly.java
@@ -41,12 +41,14 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface IFeatureBoundContainerModelAssembly<
-    MI extends IBoundInstanceModel,
-    NMI extends IBoundInstanceModelNamed,
-    FI extends IBoundInstanceModelField,
+    MI extends IBoundInstanceModel<?>,
+    NMI extends IBoundInstanceModelNamed<?>,
+    FI extends IBoundInstanceModelField<?>,
     AI extends IBoundInstanceModelAssembly,
     CGI extends IBoundInstanceModelChoiceGroup>
     extends IBoundContainerModelAssembly, IFeatureContainerModelAssembly<MI, NMI, FI, AI, IChoiceInstance, CGI> {
@@ -60,7 +62,7 @@ default Collection<MI> getModelInstances() {
   }
 
   @Override
-  default NMI getNamedModelInstanceByName(String name) {
+  default NMI getNamedModelInstanceByName(QName name) {
     return getModelContainer().getNamedModelInstanceMap().get(name);
   }
 
@@ -71,7 +73,7 @@ default Collection<NMI> getNamedModelInstances() {
   }
 
   @Override
-  default FI getFieldInstanceByName(String name) {
+  default FI getFieldInstanceByName(QName name) {
     return getModelContainer().getFieldInstanceMap().get(name);
   }
 
@@ -82,7 +84,7 @@ default Collection<FI> getFieldInstances() {
   }
 
   @Override
-  default AI getAssemblyInstanceByName(String name) {
+  default AI getAssemblyInstanceByName(QName name) {
     return getModelContainer().getAssemblyInstanceMap().get(name);
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureBoundContainerModelChoiceGroup.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureBoundContainerModelChoiceGroup.java
index 12e7ba376..a707fa3a9 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureBoundContainerModelChoiceGroup.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureBoundContainerModelChoiceGroup.java
@@ -27,6 +27,7 @@
 package gov.nist.secauto.metaschema.databind.model.impl;
 
 import gov.nist.secauto.metaschema.core.model.IContainerModelSupport;
+import gov.nist.secauto.metaschema.core.model.IFeatureContainerModelGrouped;
 import gov.nist.secauto.metaschema.databind.model.IBoundContainerModelChoiceGroup;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedField;
@@ -34,11 +35,17 @@
 
 import java.util.Collection;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface IFeatureBoundContainerModelChoiceGroup
-    extends IBoundContainerModelChoiceGroup {
+    extends IBoundContainerModelChoiceGroup, IFeatureContainerModelGrouped<
+        IBoundInstanceModelGroupedNamed,
+        IBoundInstanceModelGroupedField,
+        IBoundInstanceModelGroupedAssembly> {
 
+  @Override
   @NonNull
   IContainerModelSupport<
       IBoundInstanceModelGroupedNamed,
@@ -47,7 +54,12 @@ public interface IFeatureBoundContainerModelChoiceGroup
       IBoundInstanceModelGroupedAssembly> getModelContainer();
 
   @Override
-  default IBoundInstanceModelGroupedNamed getNamedModelInstanceByName(String name) {
+  default Collection<IBoundInstanceModelGroupedNamed> getModelInstances() {
+    return getModelContainer().getModelInstances();
+  }
+
+  @Override
+  default IBoundInstanceModelGroupedNamed getNamedModelInstanceByName(QName name) {
     return getModelContainer().getNamedModelInstanceMap().get(name);
   }
 
@@ -58,7 +70,7 @@ default Collection<IBoundInstanceModelGroupedNamed> getNamedModelInstances() {
   }
 
   @Override
-  default IBoundInstanceModelGroupedField getFieldInstanceByName(String name) {
+  default IBoundInstanceModelGroupedField getFieldInstanceByName(QName name) {
     return getModelContainer().getFieldInstanceMap().get(name);
   }
 
@@ -69,7 +81,7 @@ default Collection<IBoundInstanceModelGroupedField> getFieldInstances() {
   }
 
   @Override
-  default IBoundInstanceModelGroupedAssembly getAssemblyInstanceByName(String name) {
+  default IBoundInstanceModelGroupedAssembly getAssemblyInstanceByName(QName name) {
     return getModelContainer().getAssemblyInstanceMap().get(name);
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java
index 1b41acae5..4b1aa25a7 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java
@@ -26,14 +26,16 @@
 
 package gov.nist.secauto.metaschema.databind.model.impl;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior;
+import gov.nist.secauto.metaschema.databind.io.BindingException;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel;
 import gov.nist.secauto.metaschema.databind.model.IGroupAs;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public interface IFeatureInstanceModelGroupAs extends IBoundInstanceModel {
+public interface IFeatureInstanceModelGroupAs<ITEM> extends IBoundInstanceModel<ITEM> {
   @NonNull
   IGroupAs getGroupAs();
 
@@ -56,4 +58,13 @@ default JsonGroupAsBehavior getJsonGroupAsBehavior() {
   default XmlGroupAsBehavior getXmlGroupAsBehavior() {
     return getGroupAs().getXmlGroupAsBehavior();
   }
+
+  @Override
+  default void deepCopy(@NonNull IBoundObject fromInstance, @NonNull IBoundObject toInstance) throws BindingException {
+    Object value = getValue(fromInstance);
+    if (value != null) {
+      value = getCollectionInfo().deepCopyItems(fromInstance, toInstance);
+    }
+    setValue(toInstance, value);
+  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceFlagInline.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceFlagInline.java
index 3ba3d1d2c..17b512bfa 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceFlagInline.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceFlagInline.java
@@ -29,11 +29,13 @@
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineFlagDefinition;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-import gov.nist.secauto.metaschema.databind.IBindingContext;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionFlag;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModel;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
@@ -55,9 +57,14 @@
  */
 // TODO: implement getProperties()
 public class InstanceFlagInline
-    extends AbstractBoundInstanceJavaField<BoundFlag, IBoundDefinitionModel>
+    extends AbstractInlineFlagDefinition<IBoundDefinitionModel<IBoundObject>, IBoundDefinitionFlag, IBoundInstanceFlag>
+    // extends AbstractBoundInstanceJavaField<BoundFlag, IBoundDefinitionModel>
     implements IBoundInstanceFlag {
   @NonNull
+  private final Field javaField;
+  @NonNull
+  private final BoundFlag annotation;
+  @NonNull
   private final IDataTypeAdapter<?> javaTypeAdapter;
   @Nullable
   private final Object defaultValue;
@@ -74,13 +81,15 @@ public class InstanceFlagInline
    */
   public InstanceFlagInline(
       @NonNull Field javaField,
-      @NonNull IBoundDefinitionModel containingDefinition) {
-    super(javaField, BoundFlag.class, containingDefinition);
+      @NonNull IBoundDefinitionModel<IBoundObject> containingDefinition) {
+    super(containingDefinition);
+    this.javaField = javaField;
+    this.annotation = ModelUtil.getAnnotation(javaField, BoundFlag.class);
     Class<? extends IDataTypeAdapter<?>> adapterClass = ObjectUtils.notNull(getAnnotation().typeAdapter());
     this.javaTypeAdapter = ModelUtil.getDataTypeAdapter(
         adapterClass,
         containingDefinition.getBindingContext());
-    this.defaultValue = ModelUtil.resolveNullOrValue(getAnnotation().defaultValue(), this.javaTypeAdapter);
+    this.defaultValue = ModelUtil.resolveDefaultValue(getAnnotation().defaultValue(), this.javaTypeAdapter);
 
     this.constraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IValueConstrained retval = new ValueConstraintSet();
@@ -90,6 +99,26 @@ public InstanceFlagInline(
     }));
   }
 
+  /**
+   * Get the bound Java field.
+   *
+   * @return the bound Java field
+   */
+  @Override
+  @NonNull
+  public Field getField() {
+    return javaField;
+  }
+
+  /**
+   * Get the binding Java annotation.
+   *
+   * @return the binding Java annotation
+   */
+  @NonNull
+  private BoundFlag getAnnotation() {
+    return annotation;
+  }
   // ------------------------------------------
   // - Start annotation driven code - CPD-OFF -
   // ------------------------------------------
@@ -149,22 +178,12 @@ public Integer getUseIndex() {
     return getAnnotation().useIndex();
   }
 
-  @Override
-  public String getXmlNamespace() {
-    return ModelUtil.resolveOptionalNamespace(getAnnotation().namespace());
-  }
-
   @Override
   @Nullable
   public MarkupMultiline getRemarks() {
     return ModelUtil.resolveToMarkupMultiline(getAnnotation().remarks());
   }
 
-  @Override
-  public IBindingContext getBindingContext() {
-    return getContainingDefinition().getBindingContext();
-  }
-
   // ----------------------------------------
   // - End annotation driven code - CPD-OFF -
   // ----------------------------------------
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java
index d535d9180..621719762 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java
@@ -28,7 +28,8 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractAssemblyInstance;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
@@ -38,12 +39,14 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
+import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo;
 
 import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.function.Predicate;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 /**
@@ -51,16 +54,25 @@
  * supported by a bound definition class.
  */
 // TODO: implement getProperties()
-public class InstanceModelAssemblyComplex
-    extends AbstractBoundInstanceModelJavaField<BoundAssembly>
-    implements IBoundInstanceModelAssembly,
-    IFeatureDefinitionReferenceInstance<IBoundDefinitionModelAssembly, IBoundInstanceModelAssembly> {
+public final class InstanceModelAssemblyComplex
+    extends AbstractAssemblyInstance<
+        IBoundDefinitionModelAssembly,
+        IBoundDefinitionModelAssembly,
+        IBoundInstanceModelAssembly,
+        IBoundDefinitionModelAssembly>
+    implements IBoundInstanceModelAssembly, IFeatureInstanceModelGroupAs<IBoundObject> {
+  @NonNull
+  private final Field javaField;
+  @NonNull
+  private final BoundAssembly annotation;
+  @NonNull
+  private final Lazy<IModelInstanceCollectionInfo<IBoundObject>> collectionInfo;
   @NonNull
   private final IBoundDefinitionModelAssembly definition;
   @NonNull
   private final IGroupAs groupAs;
   @NonNull
-  private final Lazy<Map<String, IBoundProperty>> jsonProperties;
+  private final Lazy<Map<String, IBoundProperty<?>>> jsonProperties;
 
   /**
    * Construct a new field instance bound to a Java field, supported by a bound
@@ -72,43 +84,83 @@ public class InstanceModelAssemblyComplex
    *          the assembly definition this instance is bound to
    * @param containingDefinition
    *          the definition containing this instance
+   * @return the instance
    */
-  public InstanceModelAssemblyComplex(
+  @NonNull
+  public static InstanceModelAssemblyComplex newInstance(
       @NonNull Field javaField,
       @NonNull IBoundDefinitionModelAssembly definition,
       @NonNull IBoundDefinitionModelAssembly containingDefinition) {
-    super(javaField, BoundAssembly.class, containingDefinition);
-    this.definition = definition;
-    this.groupAs = ModelUtil.groupAs(getAnnotation().groupAs());
-    if (getMaxOccurs() == -1 || getMaxOccurs() > 1) {
-      if (IGroupAs.SINGLETON_GROUP_AS.equals(this.groupAs)) {
+    BoundAssembly annotation = ModelUtil.getAnnotation(javaField, BoundAssembly.class);
+    IGroupAs groupAs = ModelUtil.resolveDefaultGroupAs(
+        annotation.groupAs(),
+        containingDefinition.getContainingModule());
+    if (annotation.maxOccurs() == -1 || annotation.maxOccurs() > 1) {
+      if (IGroupAs.SINGLETON_GROUP_AS.equals(groupAs)) {
         throw new IllegalStateException(String.format("Field '%s' on class '%s' is missing the '%s' annotation.",
-            getField().getName(),
+            javaField.getName(),
             containingDefinition.getBoundClass().getName(),
             GroupAs.class.getName()));
       }
-    } else if (!IGroupAs.SINGLETON_GROUP_AS.equals(this.groupAs)) {
+    } else if (!IGroupAs.SINGLETON_GROUP_AS.equals(groupAs)) {
       // max is 1 and a groupAs is set
       throw new IllegalStateException(
           String.format(
               "Field '%s' on class '%s' has the '%s' annotation, but maxOccurs=1. A groupAs must not be specfied.",
-              getField().getName(),
+              javaField.getName(),
               containingDefinition.getBoundClass().getName(),
               GroupAs.class.getName()));
     }
+    return new InstanceModelAssemblyComplex(javaField, annotation, groupAs, definition, containingDefinition);
+  }
+
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
+  private InstanceModelAssemblyComplex(
+      @NonNull Field javaField,
+      @NonNull BoundAssembly annotation,
+      @NonNull IGroupAs groupAs,
+      @NonNull IBoundDefinitionModelAssembly definition,
+      @NonNull IBoundDefinitionModelAssembly containingDefinition) {
+    super(containingDefinition);
+    this.javaField = javaField;
+    this.annotation = annotation;
+    this.groupAs = groupAs;
+    this.collectionInfo = ObjectUtils.notNull(Lazy.lazy(() -> IModelInstanceCollectionInfo.of(this)));
+    this.definition = definition;
     this.jsonProperties = ObjectUtils.notNull(Lazy.lazy(() -> {
-      IBoundInstanceFlag jsonKey = getJsonKey();
-      Predicate<IBoundInstanceFlag> flagFilter = jsonKey == null ? null : (flag) -> !jsonKey.equals(flag);
+      IBoundInstanceFlag jsonKey = getEffectiveJsonKey();
+      Predicate<IBoundInstanceFlag> flagFilter = jsonKey == null ? null : flag -> !jsonKey.equals(flag);
       return getDefinition().getJsonProperties(flagFilter);
     }));
   }
 
+  @Override
+  public Field getField() {
+    return javaField;
+  }
+
+  /**
+   * Get the binding Java annotation.
+   *
+   * @return the binding Java annotation
+   */
+  @NonNull
+  public BoundAssembly getAnnotation() {
+    return annotation;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public IModelInstanceCollectionInfo<IBoundObject> getCollectionInfo() {
+    return collectionInfo.get();
+  }
+
   // ------------------------------------------
   // - Start annotation driven code - CPD-OFF -
   // ------------------------------------------
 
   @Override
-  public Map<String, IBoundProperty> getJsonProperties() {
+  public Map<String, IBoundProperty<?>> getJsonProperties() {
     return ObjectUtils.notNull(jsonProperties.get());
   }
 
@@ -144,12 +196,12 @@ public Integer getUseIndex() {
   }
 
   @Override
-  public final int getMinOccurs() {
+  public int getMinOccurs() {
     return getAnnotation().minOccurs();
   }
 
   @Override
-  public final int getMaxOccurs() {
+  public int getMaxOccurs() {
     return getAnnotation().maxOccurs();
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelChoiceGroup.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelChoiceGroup.java
index 99a7d30ec..21d6354f6 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelChoiceGroup.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelChoiceGroup.java
@@ -26,6 +26,8 @@
 
 package gov.nist.secauto.metaschema.databind.model.impl;
 
+import gov.nist.secauto.metaschema.core.model.AbstractChoiceGroupInstance;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.IContainerModelSupport;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.CustomCollectors;
@@ -42,6 +44,7 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundGroupedField;
 import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
+import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -49,6 +52,7 @@
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -57,15 +61,27 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 /**
  * Implements a Metaschema module choice group instance bound to a Java field.
  */
-public class InstanceModelChoiceGroup
-    extends AbstractBoundInstanceModelJavaField<BoundChoiceGroup>
+public final class InstanceModelChoiceGroup
+    extends AbstractChoiceGroupInstance<
+        IBoundDefinitionModelAssembly,
+        IBoundInstanceModelGroupedNamed,
+        IBoundInstanceModelGroupedField,
+        IBoundInstanceModelGroupedAssembly>
+    // extends AbstractBoundInstanceModelJavaField<BoundChoiceGroup>
     implements IBoundInstanceModelChoiceGroup,
-    IFeatureBoundContainerModelChoiceGroup {
+    IFeatureBoundContainerModelChoiceGroup, IFeatureInstanceModelGroupAs<IBoundObject> {
+  @NonNull
+  private final Field javaField;
+  @NonNull
+  private final BoundChoiceGroup annotation;
+  @NonNull
+  private final Lazy<IModelInstanceCollectionInfo<IBoundObject>> collectionInfo;
   @NonNull
   private final IGroupAs groupAs;
   @NonNull
@@ -82,52 +98,89 @@ public class InstanceModelChoiceGroup
    *
    * @param javaField
    *          the Java field bound to this instance
-   * @param containingDefinition
+   * @param parent
    *          the definition containing this instance
+   * @return the instance
    */
-  public InstanceModelChoiceGroup(
+  @NonNull
+  public static InstanceModelChoiceGroup newInstance(
       @NonNull Field javaField,
-      @NonNull IBoundDefinitionModelAssembly containingDefinition) {
-    super(javaField, BoundChoiceGroup.class, containingDefinition);
-    this.groupAs = ModelUtil.groupAs(getAnnotation().groupAs());
-    if (getMaxOccurs() == -1 || getMaxOccurs() > 1) {
-      if (IGroupAs.SINGLETON_GROUP_AS.equals(this.groupAs)) {
+      @NonNull IBoundDefinitionModelAssembly parent) {
+    BoundChoiceGroup annotation = ModelUtil.getAnnotation(javaField, BoundChoiceGroup.class);
+    IGroupAs groupAs = ModelUtil.resolveDefaultGroupAs(annotation.groupAs(), parent.getContainingModule());
+    if (annotation.maxOccurs() == -1 || annotation.maxOccurs() > 1) {
+      if (IGroupAs.SINGLETON_GROUP_AS.equals(groupAs)) {
         throw new IllegalStateException(String.format("Field '%s' on class '%s' is missing the '%s' annotation.",
-            getField().getName(),
-            containingDefinition.getBoundClass().getName(),
+            javaField.getName(),
+            parent.getBoundClass().getName(),
             GroupAs.class.getName()));
       }
-    } else if (!IGroupAs.SINGLETON_GROUP_AS.equals(this.groupAs)) {
+    } else if (!IGroupAs.SINGLETON_GROUP_AS.equals(groupAs)) {
       // max is 1 and a groupAs is set
       throw new IllegalStateException(
           String.format(
               "Field '%s' on class '%s' has the '%s' annotation, but maxOccurs=1. A groupAs must not be specfied.",
-              getField().getName(),
-              containingDefinition.getBoundClass().getName(),
+              javaField.getName(),
+              parent.getBoundClass().getName(),
               GroupAs.class.getName()));
     }
+    return new InstanceModelChoiceGroup(javaField, annotation, groupAs, parent);
+  }
+
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
+  private InstanceModelChoiceGroup(
+      @NonNull Field javaField,
+      @NonNull BoundChoiceGroup annotation,
+      @NonNull IGroupAs groupAs,
+      @NonNull IBoundDefinitionModelAssembly parent) {
+    super(parent);
+    this.javaField = javaField;
+    this.annotation = annotation;
+    this.groupAs = groupAs;
+    this.collectionInfo = ObjectUtils.notNull(Lazy.lazy(() -> IModelInstanceCollectionInfo.of(this)));
     this.modelContainer = ObjectUtils.notNull(Lazy.lazy(() -> new ChoiceGroupModelContainerSupport(
-        getAnnotation().assemblies(),
-        getAnnotation().fields(),
+        this.annotation.assemblies(),
+        this.annotation.fields(),
         this)));
     this.classToInstanceMap = ObjectUtils.notNull(Lazy.lazy(() -> Collections.unmodifiableMap(
         getNamedModelInstances().stream()
             .map(instance -> instance)
             .collect(Collectors.toMap(
-                item -> (Class<?>) item.getDefinition().getBoundClass(),
+                item -> item.getDefinition().getBoundClass(),
                 CustomCollectors.identity())))));
     this.qnameToInstanceMap = ObjectUtils.notNull(Lazy.lazy(() -> Collections.unmodifiableMap(
         getNamedModelInstances().stream()
             .collect(Collectors.toMap(
-                item -> item.getXmlQName(),
+                IBoundInstanceModelGroupedNamed::getXmlQName,
                 CustomCollectors.identity())))));
     this.discriminatorToInstanceMap = ObjectUtils.notNull(Lazy.lazy(() -> Collections.unmodifiableMap(
         getNamedModelInstances().stream()
             .collect(Collectors.toMap(
-                item -> item.getEffectiveDisciminatorValue(),
+                IBoundInstanceModelGroupedNamed::getEffectiveDisciminatorValue,
                 CustomCollectors.identity())))));
   }
 
+  @Override
+  public Field getField() {
+    return javaField;
+  }
+
+  /**
+   * Get the binding Java annotation.
+   *
+   * @return the binding Java annotation
+   */
+  @NonNull
+  public BoundChoiceGroup getAnnotation() {
+    return annotation;
+  }
+
+  @SuppressWarnings("null")
+  @Override
+  public IModelInstanceCollectionInfo<IBoundObject> getCollectionInfo() {
+    return collectionInfo.get();
+  }
+
   // ------------------------------------------
   // - Start annotation driven code - CPD-OFF -
   // ------------------------------------------
@@ -197,16 +250,16 @@ public ChoiceGroupModelContainerSupport getModelContainer() {
 
   @Override
   public IBoundDefinitionModelAssembly getOwningDefinition() {
-    return getContainingDefinition();
+    return getParentContainer();
   }
 
   @Override
-  public final int getMinOccurs() {
+  public int getMinOccurs() {
     return getAnnotation().minOccurs();
   }
 
   @Override
-  public final int getMaxOccurs() {
+  public int getMaxOccurs() {
     return getAnnotation().maxOccurs();
   }
 
@@ -216,20 +269,21 @@ public String getJsonDiscriminatorProperty() {
   }
 
   @Override
-  public String getJsonKeyFlagName() {
+  public String getJsonKeyFlagInstanceName() {
     return getAnnotation().jsonKey();
   }
 
   @Override
   public IBoundInstanceFlag getItemJsonKey(Object item) {
-    String jsonKeyFlagName = getJsonKeyFlagName();
+    String jsonKeyFlagName = getJsonKeyFlagInstanceName();
     IBoundInstanceFlag retval = null;
 
     if (jsonKeyFlagName != null) {
       Class<?> clazz = item.getClass();
 
       IBoundInstanceModelGroupedNamed itemInstance = getClassToInstanceMap().get(clazz);
-      retval = itemInstance.getDefinition().getFlagInstanceByName(jsonKeyFlagName);
+      retval = itemInstance.getDefinition().getFlagInstanceByName(
+          new QName(itemInstance.getXmlNamespace(), jsonKeyFlagName));
     }
     return retval;
   }
@@ -242,11 +296,11 @@ private static class ChoiceGroupModelContainerSupport
           IBoundInstanceModelGroupedAssembly> {
 
     @NonNull
-    private final Map<String, IBoundInstanceModelGroupedNamed> namedModelInstances;
+    private final Map<QName, IBoundInstanceModelGroupedNamed> namedModelInstances;
     @NonNull
-    private final Map<String, IBoundInstanceModelGroupedField> fieldInstances;
+    private final Map<QName, IBoundInstanceModelGroupedField> fieldInstances;
     @NonNull
-    private final Map<String, IBoundInstanceModelGroupedAssembly> assemblyInstances;
+    private final Map<QName, IBoundInstanceModelGroupedAssembly> assemblyInstances;
 
     public ChoiceGroupModelContainerSupport(
         @NonNull BoundGroupedAssembly[] assemblies,
@@ -259,7 +313,7 @@ public ChoiceGroupModelContainerSupport(
                 container);
           })
           .collect(Collectors.toMap(
-              instance -> instance.getEffectiveName(),
+              IBoundInstanceModelGroupedAssembly::getXmlQName,
               Function.identity(),
               CustomCollectors.useLastMapper(),
               LinkedHashMap::new))));
@@ -269,7 +323,7 @@ public ChoiceGroupModelContainerSupport(
             return IBoundInstanceModelGroupedField.newInstance(instance, container);
           })
           .collect(Collectors.toMap(
-              instance -> instance.getEffectiveName(),
+              IBoundInstanceModelGroupedField::getXmlQName,
               Function.identity(),
               CustomCollectors.useLastMapper(),
               LinkedHashMap::new))));
@@ -277,8 +331,8 @@ public ChoiceGroupModelContainerSupport(
           this.assemblyInstances.entrySet().stream(),
           this.fieldInstances.entrySet().stream())
           .collect(Collectors.toMap(
-              entry -> entry.getKey(),
-              entry -> entry.getValue(),
+              Entry::getKey,
+              Entry::getValue,
               CustomCollectors.useLastMapper(),
               LinkedHashMap::new))));
     }
@@ -290,17 +344,17 @@ public Collection<IBoundInstanceModelGroupedNamed> getModelInstances() {
     }
 
     @Override
-    public Map<String, IBoundInstanceModelGroupedNamed> getNamedModelInstanceMap() {
+    public Map<QName, IBoundInstanceModelGroupedNamed> getNamedModelInstanceMap() {
       return namedModelInstances;
     }
 
     @Override
-    public Map<String, IBoundInstanceModelGroupedField> getFieldInstanceMap() {
+    public Map<QName, IBoundInstanceModelGroupedField> getFieldInstanceMap() {
       return fieldInstances;
     }
 
     @Override
-    public Map<String, IBoundInstanceModelGroupedAssembly> getAssemblyInstanceMap() {
+    public Map<QName, IBoundInstanceModelGroupedAssembly> getAssemblyInstanceMap() {
       return assemblyInstances;
     }
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldComplex.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldComplex.java
index 5f7deebef..a7186a2fb 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldComplex.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldComplex.java
@@ -26,7 +26,10 @@
 
 package gov.nist.secauto.metaschema.databind.model.impl;
 
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
+import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
+import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.model.AbstractFieldInstance;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex;
@@ -34,29 +37,90 @@
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundProperty;
+import gov.nist.secauto.metaschema.databind.model.IGroupAs;
+import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
+import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
+import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo;
 
 import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.function.Predicate;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 /**
  * Implements a Metaschema module field instance bound to a Java field,
  * supported by a bound definition class.
  */
-public class InstanceModelFieldComplex
-    extends AbstractBoundInstanceField
-    implements IBoundInstanceModelFieldComplex,
-    IFeatureDefinitionReferenceInstance<IBoundDefinitionModelFieldComplex, IBoundInstanceModelFieldComplex> {
+public final class InstanceModelFieldComplex
+    extends AbstractFieldInstance<
+        IBoundDefinitionModelAssembly,
+        IBoundDefinitionModelFieldComplex,
+        IBoundInstanceModelFieldComplex,
+        IBoundDefinitionModelAssembly>
+    implements IBoundInstanceModelFieldComplex, IFeatureInstanceModelGroupAs<IBoundObject> {
+  @NonNull
+  private final Field javaField;
+  @NonNull
+  private final BoundField annotation;
+  @NonNull
+  private final Lazy<IModelInstanceCollectionInfo<IBoundObject>> collectionInfo;
+  @NonNull
+  private final IGroupAs groupAs;
   @NonNull
   private final DefinitionField definition;
   @NonNull
   private final Lazy<Object> defaultValue;
   @NonNull
-  private final Lazy<Map<String, IBoundProperty>> jsonProperties;
+  private final Lazy<Map<String, IBoundProperty<?>>> jsonProperties;
+
+  @NonNull
+  public static InstanceModelFieldComplex newInstance(
+      @NonNull Field javaField,
+      @NonNull DefinitionField definition,
+      @NonNull IBoundDefinitionModelAssembly parent) {
+    BoundField annotation = ModelUtil.getAnnotation(javaField, BoundField.class);
+    if (!annotation.inXmlWrapped()) {
+      if (definition.hasChildren()) { // NOPMD efficiency
+        throw new IllegalStateException(
+            String.format("Field '%s' on class '%s' is requested to be unwrapped, but it has flags preventing this.",
+                javaField.getName(),
+                parent.getBoundClass().getName()));
+      }
+      if (!definition.getJavaTypeAdapter().isUnrappedValueAllowedInXml()) {
+        throw new IllegalStateException(
+            String.format(
+                "Field '%s' on class '%s' is requested to be unwrapped, but its data type '%s' does not allow this.",
+                javaField.getName(),
+                parent.getBoundClass().getName(),
+                definition.getJavaTypeAdapter().getPreferredName()));
+      }
+    }
+
+    IGroupAs groupAs = ModelUtil.resolveDefaultGroupAs(
+        annotation.groupAs(),
+        parent.getContainingModule());
+    if (annotation.maxOccurs() == -1 || annotation.maxOccurs() > 1) {
+      if (IGroupAs.SINGLETON_GROUP_AS.equals(groupAs)) {
+        throw new IllegalStateException(String.format("Field '%s' on class '%s' is missing the '%s' annotation.",
+            javaField.getName(),
+            javaField.getDeclaringClass().getName(),
+            GroupAs.class.getName())); // NOPMD false positive
+      }
+    } else if (!IGroupAs.SINGLETON_GROUP_AS.equals(groupAs)) {
+      // max is 1 and a groupAs is set
+      throw new IllegalStateException(
+          String.format(
+              "Field '%s' on class '%s' has the '%s' annotation, but maxOccurs=1. A groupAs must not be specfied.",
+              javaField.getName(),
+              javaField.getDeclaringClass().getName(),
+              GroupAs.class.getName())); // NOPMD false positive
+    }
+    return new InstanceModelFieldComplex(javaField, annotation, groupAs, definition, parent);
+  }
 
   /**
    * Construct a new field instance bound to a Java field, supported by a bound
@@ -66,31 +130,23 @@ public class InstanceModelFieldComplex
    *          the Java field bound to this instance
    * @param definition
    *          the assembly definition this instance is bound to
-   * @param containingDefinition
+   * @param parent
    *          the definition containing this instance
    */
-  public InstanceModelFieldComplex(
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
+  private InstanceModelFieldComplex(
       @NonNull Field javaField,
+      @NonNull BoundField annotation,
+      @NonNull IGroupAs groupAs,
       @NonNull DefinitionField definition,
-      @NonNull IBoundDefinitionModelAssembly containingDefinition) {
-    super(javaField, containingDefinition);
+      @NonNull IBoundDefinitionModelAssembly parent) {
+    super(parent);
+    this.javaField = javaField;
+    this.annotation = annotation;
+    this.collectionInfo = ObjectUtils.notNull(Lazy.lazy(() -> IModelInstanceCollectionInfo.of(this)));
+    this.groupAs = groupAs;
     this.definition = definition;
 
-    if (!isEffectiveValueWrappedInXml()) {
-      if (definition.hasChildren()) { // NOPMD efficiency
-        throw new IllegalStateException(
-            String.format("Field '%s' on class '%s' is requested to be unwrapped, but it has flags preventing this.",
-                javaField.getName(),
-                containingDefinition.getBoundClass().getName()));
-      } else if (!getDefinition().getJavaTypeAdapter().isUnrappedValueAllowedInXml()) {
-        throw new IllegalStateException(
-            String.format(
-                "Field '%s' on class '%s' is requested to be unwrapped, but its data type '%s' does not allow this.",
-                javaField.getName(),
-                containingDefinition.getBoundClass().getName(),
-                getDefinition().getJavaTypeAdapter().getPreferredName()));
-      }
-    }
     this.defaultValue = ObjectUtils.notNull(Lazy.lazy(() -> {
       Object retval = null;
       if (getMaxOccurs() == 1) {
@@ -98,7 +154,7 @@ public InstanceModelFieldComplex(
 
         Object fieldValueDefault = fieldValue.getDefaultValue();
         if (fieldValueDefault != null) {
-          retval = newInstance();
+          retval = newInstance(null);
           fieldValue.setValue(retval, fieldValueDefault);
 
           for (IBoundInstanceFlag flag : definition.getFlagInstances()) {
@@ -113,20 +169,37 @@ public InstanceModelFieldComplex(
     }));
     this.jsonProperties = ObjectUtils.notNull(Lazy.lazy(() -> {
       Predicate<IBoundInstanceFlag> flagFilter = null;
-      IBoundInstanceFlag jsonKey = getJsonKey();
+      IBoundInstanceFlag jsonKey = getEffectiveJsonKey();
       if (jsonKey != null) {
-        flagFilter = (flag) -> !jsonKey.equals(flag);
+        flagFilter = flag -> !jsonKey.equals(flag);
       }
       return getDefinition().getJsonProperties(flagFilter);
     }));
   }
 
-  // ------------------------------------------
-  // - Start annotation driven code - CPD-OFF -
-  // ------------------------------------------
+  @Override
+  public Field getField() {
+    return javaField;
+  }
 
+  /**
+   * Get the binding Java annotation.
+   *
+   * @return the binding Java annotation
+   */
+  @NonNull
+  public BoundField getAnnotation() {
+    return annotation;
+  }
+
+  @SuppressWarnings("null")
   @Override
-  public final DefinitionField getDefinition() {
+  public IModelInstanceCollectionInfo<IBoundObject> getCollectionInfo() {
+    return collectionInfo.get();
+  }
+
+  @Override
+  public DefinitionField getDefinition() {
     return definition;
   }
 
@@ -136,12 +209,57 @@ public Object getDefaultValue() {
   }
 
   @Override
-  public Map<String, IBoundProperty> getJsonProperties() {
+  public Map<String, IBoundProperty<?>> getJsonProperties() {
     return ObjectUtils.notNull(jsonProperties.get());
   }
 
+  // ------------------------------------------
+  // - Start annotation driven code - CPD-OFF -
+  // ------------------------------------------
+
+  @Override
+  public IGroupAs getGroupAs() {
+    return groupAs;
+  }
+
+  @Override
+  public String getFormalName() {
+    return ModelUtil.resolveNoneOrValue(getAnnotation().formalName());
+  }
+
+  @Override
+  public MarkupLine getDescription() {
+    return ModelUtil.resolveToMarkupLine(getAnnotation().description());
+  }
+
   @Override
   public String getUseName() {
     return ModelUtil.resolveNoneOrValue(getAnnotation().useName());
   }
+
+  @Override
+  public Integer getUseIndex() {
+    int value = getAnnotation().useIndex();
+    return value == Integer.MIN_VALUE ? null : value;
+  }
+
+  @Override
+  public boolean isInXmlWrapped() {
+    return getAnnotation().inXmlWrapped();
+  }
+
+  @Override
+  public int getMinOccurs() {
+    return getAnnotation().minOccurs();
+  }
+
+  @Override
+  public int getMaxOccurs() {
+    return getAnnotation().maxOccurs();
+  }
+
+  @Override
+  public MarkupMultiline getRemarks() {
+    return ModelUtil.resolveToMarkupMultiline(getAnnotation().remarks());
+  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldScalar.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldScalar.java
index 214447623..344c78258 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldScalar.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelFieldScalar.java
@@ -27,16 +27,24 @@
 package gov.nist.secauto.metaschema.databind.model.impl;
 
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
-import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
+import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
+import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelField;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelFieldScalar;
+import gov.nist.secauto.metaschema.databind.model.IGroupAs;
+import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
+import gov.nist.secauto.metaschema.databind.model.annotations.GroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
 import gov.nist.secauto.metaschema.databind.model.annotations.ValueConstraints;
+import gov.nist.secauto.metaschema.databind.model.info.IModelInstanceCollectionInfo;
 
 import java.lang.reflect.Field;
 import java.util.Optional;
@@ -45,10 +53,22 @@
 import edu.umd.cs.findbugs.annotations.Nullable;
 import nl.talsmasoftware.lazy4j.Lazy;
 
-public class InstanceModelFieldScalar
-    extends AbstractBoundInstanceField
-    implements IBoundInstanceModelFieldScalar,
-    IFeatureBoundContainerFlag {
+public final class InstanceModelFieldScalar
+    extends AbstractInlineFieldDefinition<
+        IBoundDefinitionModelAssembly,
+        IBoundDefinitionModelField<Object>,
+        IBoundInstanceModelFieldScalar,
+        IBoundDefinitionModelAssembly,
+        IBoundInstanceFlag>
+    implements IBoundInstanceModelFieldScalar, IFeatureInstanceModelGroupAs<Object> {
+  @NonNull
+  private final Field javaField;
+  @NonNull
+  private final BoundField annotation;
+  @NonNull
+  private final Lazy<IModelInstanceCollectionInfo<Object>> collectionInfo;
+  @NonNull
+  private final IGroupAs groupAs;
   @NonNull
   private final IDataTypeAdapter<?> javaTypeAdapter;
   @Nullable
@@ -61,39 +81,93 @@ public class InstanceModelFieldScalar
    *
    * @param javaField
    *          the Java field bound to this instance
+   * @param annotation
+   *          the field binding annotation
+   * @param groupAs
+   *          the grouping info for the model instance
    * @param containingDefinition
    *          the definition containing this instance
+   * @return the instance
    */
-  public InstanceModelFieldScalar(
+  @NonNull
+  public static InstanceModelFieldScalar newInstance(
+      @NonNull Field javaField,
+      @NonNull IBoundDefinitionModelAssembly containingDefinition) {
+    BoundField annotation = ModelUtil.getAnnotation(javaField, BoundField.class);
+    IGroupAs groupAs = ModelUtil.resolveDefaultGroupAs(
+        annotation.groupAs(),
+        containingDefinition.getContainingModule());
+
+    if (annotation.maxOccurs() == -1 || annotation.maxOccurs() > 1) {
+      if (IGroupAs.SINGLETON_GROUP_AS.equals(groupAs)) {
+        throw new IllegalStateException(String.format("Field '%s' on class '%s' is missing the '%s' annotation.",
+            javaField.getName(),
+            javaField.getDeclaringClass().getName(),
+            GroupAs.class.getName())); // NOPMD false positive
+      }
+    } else if (!IGroupAs.SINGLETON_GROUP_AS.equals(groupAs)) {
+      // max is 1 and a groupAs is set
+      throw new IllegalStateException(
+          String.format(
+              "Field '%s' on class '%s' has the '%s' annotation, but maxOccurs=1. A groupAs must not be specfied.",
+              javaField.getName(),
+              javaField.getDeclaringClass().getName(),
+              GroupAs.class.getName())); // NOPMD false positive
+    }
+
+    return new InstanceModelFieldScalar(
+        javaField,
+        annotation,
+        groupAs,
+        containingDefinition);
+  }
+
+  private InstanceModelFieldScalar(
       @NonNull Field javaField,
+      @NonNull BoundField annotation,
+      @NonNull IGroupAs groupAs,
       @NonNull IBoundDefinitionModelAssembly containingDefinition) {
-    super(javaField, containingDefinition);
+    super(containingDefinition);
+    this.javaField = javaField;
+    this.annotation = annotation;
+    this.collectionInfo = ObjectUtils.notNull(Lazy.lazy(() -> IModelInstanceCollectionInfo.of(this)));
+    this.groupAs = groupAs;
     this.javaTypeAdapter = ModelUtil.getDataTypeAdapter(
-        getAnnotation().typeAdapter(),
+        annotation.typeAdapter(),
         containingDefinition.getBindingContext());
-    this.defaultValue = ModelUtil.resolveDefaultValue(getAnnotation().defaultValue(), this.javaTypeAdapter);
-
+    this.defaultValue = ModelUtil.resolveDefaultValue(annotation.defaultValue(), this.javaTypeAdapter);
     this.constraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IValueConstrained retval = new ValueConstraintSet();
-      ValueConstraints valueAnnotation = getAnnotation().valueConstraints();
+      ValueConstraints valueAnnotation = annotation.valueConstraints();
       ConstraintSupport.parse(valueAnnotation, ISource.modelSource(), retval);
       return retval;
     }));
   }
 
   @Override
-  public IBoundInstanceFlag getJsonKeyFlagInstance() {
-    // no flags
-    return null;
+  public IBindingContext getBindingContext() {
+    return getContainingDefinition().getBindingContext();
   }
 
-  // ------------------------------------------
-  // - Start annotation driven code - CPD-OFF -
-  // ------------------------------------------
+  @Override
+  public Field getField() {
+    return javaField;
+  }
+
+  /**
+   * Get the binding Java annotation.
+   *
+   * @return the binding Java annotation
+   */
+  @NonNull
+  public BoundField getAnnotation() {
+    return annotation;
+  }
 
+  @SuppressWarnings("null")
   @Override
-  public IContainerFlagSupport<IBoundInstanceFlag> getFlagContainer() {
-    return IContainerFlagSupport.empty();
+  public IModelInstanceCollectionInfo<Object> getCollectionInfo() {
+    return collectionInfo.get();
   }
 
   @SuppressWarnings("null")
@@ -108,6 +182,56 @@ public IDataTypeAdapter<?> getJavaTypeAdapter() {
     return javaTypeAdapter;
   }
 
+  @Override
+  public Object getDefaultValue() {
+    return defaultValue;
+  }
+
+  @Override
+  public IGroupAs getGroupAs() {
+    return groupAs;
+  }
+
+  // ------------------------------------------
+  // - Start annotation driven code - CPD-OFF -
+  // ------------------------------------------
+
+  @Override
+  public String getFormalName() {
+    return ModelUtil.resolveNoneOrValue(getAnnotation().formalName());
+  }
+
+  @Override
+  public MarkupLine getDescription() {
+    return ModelUtil.resolveToMarkupLine(getAnnotation().description());
+  }
+
+  @Override
+  public Integer getUseIndex() {
+    int value = getAnnotation().useIndex();
+    return value == Integer.MIN_VALUE ? null : value;
+  }
+
+  @Override
+  public boolean isInXmlWrapped() {
+    return getAnnotation().inXmlWrapped();
+  }
+
+  @Override
+  public int getMinOccurs() {
+    return getAnnotation().minOccurs();
+  }
+
+  @Override
+  public int getMaxOccurs() {
+    return getAnnotation().maxOccurs();
+  }
+
+  @Override
+  public MarkupMultiline getRemarks() {
+    return ModelUtil.resolveToMarkupMultiline(getAnnotation().remarks());
+  }
+
   @Override
   public String getName() {
     // the name is stored as a usename to remain consistent with non-scalar valued
@@ -116,11 +240,6 @@ public String getName() {
         Optional.ofNullable(ModelUtil.resolveNoneOrValue(getAnnotation().useName())).orElse(getField().getName()));
   }
 
-  @Override
-  public Object getDefaultValue() {
-    return defaultValue;
-  }
-
   // ----------------------------------------
   // - End annotation driven code - CPD-OFF -
   // ----------------------------------------
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java
index e9d2615e1..c2f2e0a4b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java
@@ -28,10 +28,10 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractAssemblyInstance;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundProperty;
@@ -39,7 +39,6 @@
 import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
 
 import java.util.Map;
-import java.util.function.Predicate;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import nl.talsmasoftware.lazy4j.Lazy;
@@ -49,13 +48,19 @@
  * instance.
  */
 public class InstanceModelGroupedAssembly
-    extends AbstractBoundInstanceModelGroupedNamed<BoundGroupedAssembly>
-    implements IBoundInstanceModelGroupedAssembly,
-    IFeatureDefinitionReferenceInstance<IBoundDefinitionModelAssembly, IBoundInstanceModelGroupedAssembly> {
+    extends AbstractAssemblyInstance<
+        IBoundInstanceModelChoiceGroup,
+        IBoundDefinitionModelAssembly,
+        IBoundInstanceModelGroupedAssembly,
+        IBoundDefinitionModelAssembly>
+    // extends AbstractBoundInstanceModelGroupedNamed<BoundGroupedAssembly>
+    implements IBoundInstanceModelGroupedAssembly {
+  @NonNull
+  private final BoundGroupedAssembly annotation;
   @NonNull
   private final IBoundDefinitionModelAssembly definition;
   @NonNull
-  private final Lazy<Map<String, IBoundProperty>> jsonProperties;
+  private final Lazy<Map<String, IBoundProperty<?>>> jsonProperties;
 
   /**
    * Construct a new field model instance instance that is a member of a choice
@@ -72,13 +77,18 @@ public InstanceModelGroupedAssembly(
       @NonNull BoundGroupedAssembly annotation,
       @NonNull IBoundDefinitionModelAssembly definition,
       @NonNull IBoundInstanceModelChoiceGroup container) {
-    super(annotation, container);
+    super(container);
+    this.annotation = annotation;
     this.definition = definition;
-    this.jsonProperties = ObjectUtils.notNull(Lazy.lazy(() -> {
-      IBoundInstanceFlag jsonKey = getJsonKey();
-      Predicate<IBoundInstanceFlag> flagFilter = jsonKey == null ? null : (flag) -> !jsonKey.equals(flag);
-      return getDefinition().getJsonProperties(flagFilter);
-    }));
+    // IBoundInstanceFlag jsonKey = getEffectiveJsonKey();
+    // Predicate<IBoundInstanceFlag> flagFilter = jsonKey == null ? null : (flag) ->
+    // !jsonKey.equals(flag);
+    // return getDefinition().getJsonProperties(flagFilter);
+    this.jsonProperties = ObjectUtils.notNull(Lazy.lazy(() -> getDefinition().getJsonProperties(null)));
+  }
+
+  private BoundGroupedAssembly getAnnotation() {
+    return annotation;
   }
 
   // ------------------------------------------
@@ -86,7 +96,12 @@ public InstanceModelGroupedAssembly(
   // ------------------------------------------
 
   @Override
-  public Map<String, IBoundProperty> getJsonProperties() {
+  public Class<? extends IBoundObject> getBoundClass() {
+    return getAnnotation().binding();
+  }
+
+  @Override
+  public Map<String, IBoundProperty<?>> getJsonProperties() {
     return ObjectUtils.notNull(jsonProperties.get());
   }
 
@@ -122,11 +137,6 @@ public String getUseName() {
 
   @Override
   public Integer getUseIndex() {
-    return ModelUtil.resolveNullOrInteger(getAnnotation().useIndex());
-  }
-
-  @Override
-  public Class<?> getBoundClass() {
-    return getAnnotation().binding();
+    return ModelUtil.resolveDefaultInteger(getAnnotation().useIndex());
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java
index 07e65912d..ff86319e9 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java
@@ -28,8 +28,10 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractFieldInstance;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup;
@@ -45,42 +47,59 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceModelGroupedFieldComplex
-    extends AbstractBoundInstanceModelGroupedNamed<BoundGroupedField>
-    implements IBoundInstanceModelGroupedField,
-    IFeatureDefinitionReferenceInstance<IBoundDefinitionModelFieldComplex, IBoundInstanceModelGroupedField> {
+    extends AbstractFieldInstance<
+        IBoundInstanceModelChoiceGroup,
+        IBoundDefinitionModelFieldComplex,
+        IBoundInstanceModelGroupedField,
+        IBoundDefinitionModelAssembly>
+
+    // extends AbstractBoundInstanceModelGroupedNamed<BoundGroupedField>
+    implements IBoundInstanceModelGroupedField {
+  @NonNull
+  private final BoundGroupedField annotation;
   @NonNull
   private final DefinitionField definition;
   @NonNull
-  private final Lazy<Map<String, IBoundProperty>> jsonProperties;
+  private final Lazy<Map<String, IBoundProperty<?>>> jsonProperties;
 
   public InstanceModelGroupedFieldComplex(
       @NonNull BoundGroupedField annotation,
       @NonNull DefinitionField definition,
       @NonNull IBoundInstanceModelChoiceGroup container) {
-    super(annotation, container);
+    super(container);
+    this.annotation = annotation;
     this.definition = definition;
     this.jsonProperties = ObjectUtils.notNull(Lazy.lazy(() -> {
       Predicate<IBoundInstanceFlag> flagFilter = null;
-      IBoundInstanceFlag jsonKey = getJsonKey();
+      IBoundInstanceFlag jsonKey = getEffectiveJsonKey();
       if (jsonKey != null) {
-        flagFilter = (flag) -> !jsonKey.equals(flag);
+        flagFilter = flag -> !jsonKey.equals(flag);
       }
 
       IBoundInstanceFlag jsonValueKey = getDefinition().getJsonValueKeyFlagInstance();
       if (jsonValueKey != null) {
-        Predicate<IBoundInstanceFlag> jsonValueKeyFilter = (flag) -> !flag.equals(jsonValueKey);
+        Predicate<IBoundInstanceFlag> jsonValueKeyFilter = flag -> !flag.equals(jsonValueKey);
         flagFilter = flagFilter == null ? jsonValueKeyFilter : flagFilter.and(jsonValueKeyFilter);
       }
       return getDefinition().getJsonProperties(flagFilter);
     }));
   }
 
+  private BoundGroupedField getAnnotation() {
+    return annotation;
+  }
+
   // ------------------------------------------
   // - Start annotation driven code - CPD-OFF -
   // ------------------------------------------
 
   @Override
-  public Map<String, IBoundProperty> getJsonProperties() {
+  public Class<? extends IBoundObject> getBoundClass() {
+    return getAnnotation().binding();
+  }
+
+  @Override
+  public Map<String, IBoundProperty<?>> getJsonProperties() {
     return ObjectUtils.notNull(jsonProperties.get());
   }
 
@@ -116,12 +135,7 @@ public String getUseName() {
 
   @Override
   public Integer getUseIndex() {
-    return ModelUtil.resolveNullOrInteger(getAnnotation().useIndex());
-  }
-
-  @Override
-  public Class<?> getBoundClass() {
-    return getAnnotation().binding();
+    return ModelUtil.resolveDefaultInteger(getAnnotation().useIndex());
   }
 
   // ----------------------------------------
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/package-info.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/package-info.java
index 1316bbc9e..9c4d1cf32 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/package-info.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/package-info.java
@@ -26,8 +26,8 @@
 
 /**
  * Provides an implementation of the Module model
- * ({@link gov.nist.secauto.metaschema.core.model}) representing module
- * constructs as bound Java class annotations
+ * ({@link gov.nist.secauto.metaschema.core.model}) represented by bound Java
+ * class annotations
  * ({@link gov.nist.secauto.metaschema.databind.model.annotations}).
  */
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java
index 9998c6447..ccda2c620 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java
@@ -30,19 +30,19 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public abstract class AbstractModelInstanceCollectionInfo
-    implements IModelInstanceCollectionInfo {
+public abstract class AbstractModelInstanceCollectionInfo<ITEM>
+    implements IModelInstanceCollectionInfo<ITEM> {
 
   @NonNull
-  private final IBoundInstanceModel instance;
+  private final IBoundInstanceModel<ITEM> instance;
 
   public AbstractModelInstanceCollectionInfo(
-      @NonNull IBoundInstanceModel instance) {
+      @NonNull IBoundInstanceModel<ITEM> instance) {
     this.instance = instance;
   }
 
   @Override
-  public IBoundInstanceModel getInstance() {
+  public IBoundInstanceModel<ITEM> getInstance() {
     return instance;
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java
index 21fc109c0..d226e3c3b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java
@@ -26,20 +26,22 @@
 
 package gov.nist.secauto.metaschema.databind.model.info;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel;
+import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelNamed;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
-public abstract class AbstractModelInstanceReadHandler implements IModelInstanceReadHandler {
+public abstract class AbstractModelInstanceReadHandler<ITEM> implements IModelInstanceReadHandler<ITEM> {
   @NonNull
-  private final IBoundInstanceModel instance;
+  private final IBoundInstanceModel<ITEM> instance;
   @NonNull
-  private final Object parentObject;
+  private final IBoundObject parentObject;
 
   protected AbstractModelInstanceReadHandler(
-      @NonNull IBoundInstanceModel instance,
-      @NonNull Object parentObject) {
+      @NonNull IBoundInstanceModel<ITEM> instance,
+      @NonNull IBoundObject parentObject) {
     this.instance = instance;
     this.parentObject = parentObject;
   }
@@ -50,7 +52,7 @@ protected AbstractModelInstanceReadHandler(
    * @return the collection information
    */
   @NonNull
-  public IBoundInstanceModel getInstance() {
+  public IBoundInstanceModel<ITEM> getInstance() {
     return instance;
   }
 
@@ -60,21 +62,30 @@ public IBoundInstanceModel getInstance() {
    * @return the collection information
    */
   @NonNull
-  public IModelInstanceCollectionInfo getCollectionInfo() {
+  public IModelInstanceCollectionInfo<ITEM> getCollectionInfo() {
     return getInstance().getCollectionInfo();
   }
 
   /**
+   * Get the object onto which parsed data will be stored.
+   *
    * @return the parentObject
    */
   @NonNull
-  public Object getParentObject() {
+  public IBoundObject getParentObject() {
     return parentObject;
   }
 
   @Override
-  @Nullable
   public String getJsonKeyFlagName() {
-    return getCollectionInfo().getInstance().getJsonKeyFlagName();
+    IBoundInstanceModel<?> instance = getInstance();
+    String retval = null;
+    if (instance instanceof IBoundInstanceModelNamed) {
+      IBoundInstanceFlag jsonKey = ((IBoundInstanceModelNamed<?>) instance).getEffectiveJsonKey();
+      if (jsonKey != null) {
+        retval = jsonKey.getEffectiveName();
+      }
+    }
+    return retval;
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java
index bde6e954f..b8cfbcc22 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java
@@ -36,12 +36,12 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public abstract class AbstractModelInstanceWriteHandler
-    implements IModelInstanceWriteHandler {
+public abstract class AbstractModelInstanceWriteHandler<ITEM>
+    implements IModelInstanceWriteHandler<ITEM> {
   @NonNull
-  private final IBoundInstanceModel instance;
+  private final IBoundInstanceModel<ITEM> instance;
 
-  public AbstractModelInstanceWriteHandler(@NonNull IBoundInstanceModel instance) {
+  public AbstractModelInstanceWriteHandler(@NonNull IBoundInstanceModel<ITEM> instance) {
     this.instance = instance;
   }
 
@@ -50,7 +50,7 @@ public AbstractModelInstanceWriteHandler(@NonNull IBoundInstanceModel instance)
    *
    * @return the instance
    */
-  public IBoundInstanceModel getInstance() {
+  public IBoundInstanceModel<ITEM> getInstance() {
     return instance;
   }
 
@@ -60,22 +60,22 @@ public IBoundInstanceModel getInstance() {
    * @return the info
    */
   @NonNull
-  public IModelInstanceCollectionInfo getCollectionInfo() {
+  public IModelInstanceCollectionInfo<ITEM> getCollectionInfo() {
     return instance.getCollectionInfo();
   }
 
   @Override
-  public void writeList(List<?> items) throws IOException {
+  public void writeList(List<ITEM> items) throws IOException {
     writeCollection(items);
   }
 
   @Override
-  public void writeMap(Map<String, ?> items) throws IOException {
+  public void writeMap(Map<String, ITEM> items) throws IOException {
     writeCollection(ObjectUtils.notNull(items.values()));
   }
 
-  private void writeCollection(@NonNull Collection<?> items) throws IOException {
-    for (Object item : items) {
+  private void writeCollection(@NonNull Collection<ITEM> items) throws IOException {
+    for (ITEM item : items) {
       writeItem(ObjectUtils.requireNonNull(item));
     }
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java
index 58d6f9293..caf280beb 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java
@@ -26,6 +26,8 @@
 
 package gov.nist.secauto.metaschema.databind.model.info;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelComplex;
@@ -34,11 +36,12 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
+import java.util.function.Supplier;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IFeatureComplexItemValueHandler extends IItemValueHandler {
+public interface IFeatureComplexItemValueHandler extends IItemValueHandler<IBoundObject> {
   /**
    * Get the Metaschema definition representing the bound complex data.
    *
@@ -56,15 +59,21 @@ public interface IFeatureComplexItemValueHandler extends IItemValueHandler {
   // @Nullable
   // String getJsonKeyFlagName();
 
+  /**
+   * Get the mapping of JSON property names to property bindings.
+   *
+   * @return the mapping
+   */
+  // REFACTOR: move JSON-specific methods to a binding cache implementation
   @NonNull
-  Map<String, IBoundProperty> getJsonProperties();
+  Map<String, IBoundProperty<?>> getJsonProperties();
 
   // REFACTOR: flatten implementations?
   @Override
   @NonNull
-  Object deepCopyItem(
-      @NonNull Object item,
-      @Nullable Object parentInstance) throws BindingException;
+  IBoundObject deepCopyItem(
+      @NonNull IBoundObject item,
+      @Nullable IBoundObject parentInstance) throws BindingException;
 
   /**
    * The class this binding is to.
@@ -72,25 +81,36 @@ Object deepCopyItem(
    * @return the bound class
    */
   @NonNull
-  Class<?> getBoundClass();
+  Class<? extends IBoundObject> getBoundClass();
 
   /**
    * Gets a new instance of the bound class.
    *
    * @param <CLASS>
    *          the type of the bound class
+   * @param supplier
+   *          the metaschema data generator used to capture parse information
+   *          (i.e., location)
    * @return a Java object for the class
    * @throws RuntimeException
    *           if the instance cannot be created due to a binding error
    */
   @SuppressWarnings("PMD.AvoidThrowingRawExceptionTypes")
   @NonNull
-  default <CLASS> CLASS newInstance() {
+  default <CLASS extends IBoundObject> CLASS newInstance(@Nullable Supplier<IMetaschemaData> supplier) {
     Class<?> clazz = getBoundClass();
     try {
-      @SuppressWarnings("unchecked") Constructor<CLASS> constructor
-          = (Constructor<CLASS>) clazz.getDeclaredConstructor();
-      return ObjectUtils.notNull(constructor.newInstance());
+      CLASS retval;
+      if (supplier != null) {
+        @SuppressWarnings("unchecked") Constructor<CLASS> constructor
+            = (Constructor<CLASS>) clazz.getDeclaredConstructor(IMetaschemaData.class);
+        retval = constructor.newInstance(supplier.get());
+      } else {
+        @SuppressWarnings("unchecked") Constructor<CLASS> constructor
+            = (Constructor<CLASS>) clazz.getDeclaredConstructor();
+        retval = constructor.newInstance();
+      }
+      return ObjectUtils.notNull(retval);
     } catch (NoSuchMethodException ex) {
       String msg = String.format("Class '%s' does not have a required no-arg constructor.", clazz.getName());
       throw new RuntimeException(msg, ex);
@@ -100,10 +120,10 @@ default <CLASS> CLASS newInstance() {
   }
 
   void callBeforeDeserialize(
-      @NonNull Object targetObject,
-      @Nullable Object parentObject) throws BindingException;
+      @NonNull IBoundObject targetObject,
+      @Nullable IBoundObject parentObject) throws BindingException;
 
   void callAfterDeserialize(
-      @NonNull Object targetObject,
-      @Nullable Object parentObject) throws BindingException;
+      @NonNull IBoundObject targetObject,
+      @Nullable IBoundObject parentObject) throws BindingException;
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java
index d62b4763d..1fa7cfd24 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java
@@ -27,18 +27,15 @@
 package gov.nist.secauto.metaschema.databind.model.info;
 
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
+import gov.nist.secauto.metaschema.databind.model.IValuedMutable;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
 public interface IFeatureScalarItemValueHandler
-    extends IItemValueHandler {
-
-  @Nullable
-  Object getValue(@NonNull Object parent);
-
-  void setValue(@NonNull Object parent, Object value);
+    extends IItemValueHandler<Object>, IValuedMutable {
 
   default void setValue(@NonNull Object parent, @NonNull String text) {
     Object item = getValueFromString(text);
@@ -64,7 +61,7 @@ default Object getValueFromString(@NonNull String text) {
   IDataTypeAdapter<?> getJavaTypeAdapter();
 
   @Override
-  default Object deepCopyItem(Object source, Object parentInstance) throws BindingException {
+  default Object deepCopyItem(Object source, IBoundObject parentInstance) throws BindingException {
     return getJavaTypeAdapter().copy(source);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemReadHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemReadHandler.java
index 046c8418a..761e4a4b0 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemReadHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemReadHandler.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.model.info;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue;
@@ -56,7 +57,7 @@ public interface IItemReadHandler {
    */
   @NonNull
   Object readItemFlag(
-      @NonNull Object parent,
+      @NonNull IBoundObject parent,
       @NonNull IBoundInstanceFlag instance) throws IOException;
 
   /**
@@ -72,7 +73,7 @@ Object readItemFlag(
    */
   @NonNull
   Object readItemField(
-      @NonNull Object parent,
+      @NonNull IBoundObject parent,
       @NonNull IBoundInstanceModelFieldScalar instance) throws IOException;
 
   /**
@@ -87,8 +88,8 @@ Object readItemField(
    *           if an error occurred while parsing
    */
   @NonNull
-  Object readItemField(
-      @NonNull Object parent,
+  IBoundObject readItemField(
+      @NonNull IBoundObject parent,
       @NonNull IBoundInstanceModelFieldComplex instance) throws IOException;
 
   /**
@@ -103,8 +104,8 @@ Object readItemField(
    *           if an error occurred while parsing
    */
   @NonNull
-  Object readItemField(
-      @NonNull Object parent,
+  IBoundObject readItemField(
+      @NonNull IBoundObject parent,
       @NonNull IBoundInstanceModelGroupedField instance) throws IOException;
 
   /**
@@ -120,8 +121,8 @@ Object readItemField(
    *           if an error occurred while parsing
    */
   @NonNull
-  Object readItemField(
-      @Nullable Object parent,
+  IBoundObject readItemField(
+      @Nullable IBoundObject parent,
       @NonNull IBoundDefinitionModelFieldComplex definition) throws IOException;
 
   /**
@@ -137,7 +138,7 @@ Object readItemField(
    */
   @NonNull
   Object readItemFieldValue(
-      @NonNull Object parent,
+      @NonNull IBoundObject parent,
       @NonNull IBoundFieldValue fieldValue) throws IOException;
 
   /**
@@ -152,8 +153,8 @@ Object readItemFieldValue(
    *           if an error occurred while parsing
    */
   @NonNull
-  Object readItemAssembly(
-      @NonNull Object parent,
+  IBoundObject readItemAssembly(
+      @NonNull IBoundObject parent,
       @NonNull IBoundInstanceModelAssembly instance) throws IOException;
 
   /**
@@ -168,8 +169,8 @@ Object readItemAssembly(
    *           if an error occurred while parsing
    */
   @NonNull
-  Object readItemAssembly(
-      @NonNull Object parent,
+  IBoundObject readItemAssembly(
+      @NonNull IBoundObject parent,
       @NonNull IBoundInstanceModelGroupedAssembly instance) throws IOException;
 
   /**
@@ -185,8 +186,8 @@ Object readItemAssembly(
    *           if an error occurred while parsing
    */
   @NonNull
-  Object readItemAssembly(
-      @Nullable Object parent,
+  IBoundObject readItemAssembly(
+      @Nullable IBoundObject parent,
       @NonNull IBoundDefinitionModelAssembly definition) throws IOException;
 
   /**
@@ -201,7 +202,7 @@ Object readItemAssembly(
    *           if an error occurred while parsing
    */
   @NonNull
-  Object readChoiceGroupItem(
-      @NonNull Object parent,
+  IBoundObject readChoiceGroupItem(
+      @NonNull IBoundObject parent,
       @NonNull IBoundInstanceModelChoiceGroup instance) throws IOException;
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemValueHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemValueHandler.java
index 5805adf7d..88a3bfd1c 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemValueHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemValueHandler.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.model.info;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
 
 import java.io.IOException;
@@ -33,7 +34,14 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IItemValueHandler {
+/**
+ * A feature interface for handling read, writing, and copying item objects,
+ * which are the data building blocks of a Metaschema module instance.
+ *
+ * @param <TYPE>
+ *          the Java type of the item
+ */
+public interface IItemValueHandler<TYPE> {
   /**
    * Parse and return an item.
    *
@@ -47,8 +55,8 @@ public interface IItemValueHandler {
    *           if an error occurred while parsing
    */
   @NonNull
-  Object readItem(
-      @Nullable Object parent,
+  TYPE readItem(
+      @Nullable IBoundObject parent,
       @NonNull IItemReadHandler handler) throws IOException;
 
   /**
@@ -62,7 +70,7 @@ Object readItem(
    *           if an error occurred while writing
    */
   void writeItem(
-      @NonNull Object item,
+      @NonNull TYPE item,
       @NonNull IItemWriteHandler handler) throws IOException;
 
   /**
@@ -77,5 +85,5 @@ void writeItem(
    *           if an error occurred while analyzing the bound objects
    */
   @NonNull
-  Object deepCopyItem(@NonNull Object item, @Nullable Object parentInstance) throws BindingException;
+  TYPE deepCopyItem(@NonNull TYPE item, @Nullable IBoundObject parentInstance) throws BindingException;
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemWriteHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemWriteHandler.java
index 917d597e3..f99da605e 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemWriteHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IItemWriteHandler.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.model.info;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelFieldComplex;
 import gov.nist.secauto.metaschema.databind.model.IBoundFieldValue;
@@ -81,7 +82,7 @@ void writeItemField(
    *           if an error occurred while parsing
    */
   void writeItemField(
-      @NonNull Object item,
+      @NonNull IBoundObject item,
       @NonNull IBoundInstanceModelFieldComplex instance) throws IOException;
 
   /**
@@ -95,7 +96,7 @@ void writeItemField(
    *           if an error occurred while parsing
    */
   void writeItemField(
-      @NonNull Object item,
+      @NonNull IBoundObject item,
       @NonNull IBoundInstanceModelGroupedField instance) throws IOException;
 
   /**
@@ -109,7 +110,7 @@ void writeItemField(
    *           if an error occurred while parsing
    */
   void writeItemField(
-      @NonNull Object item,
+      @NonNull IBoundObject item,
       @NonNull IBoundDefinitionModelFieldComplex definition) throws IOException;
 
   /**
@@ -137,7 +138,7 @@ void writeItemFieldValue(
    *           if an error occurred while parsing
    */
   void writeItemAssembly(
-      @NonNull Object item,
+      @NonNull IBoundObject item,
       @NonNull IBoundInstanceModelAssembly instance) throws IOException;
 
   /**
@@ -151,7 +152,7 @@ void writeItemAssembly(
    *           if an error occurred while parsing
    */
   void writeItemAssembly(
-      @NonNull Object item,
+      @NonNull IBoundObject item,
       @NonNull IBoundInstanceModelGroupedAssembly instance) throws IOException;
 
   /**
@@ -165,7 +166,7 @@ void writeItemAssembly(
    *           if an error occurred while parsing
    */
   void writeItemAssembly(
-      @NonNull Object item,
+      @NonNull IBoundObject item,
       @NonNull IBoundDefinitionModelAssembly definition) throws IOException;
 
   /**
@@ -179,7 +180,7 @@ void writeItemAssembly(
    *           if an error occurred while parsing
    */
   void writeChoiceGroupItem(
-      @NonNull Object item,
+      @NonNull IBoundObject item,
       @NonNull IBoundInstanceModelChoiceGroup instance) throws IOException;
 
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceCollectionInfo.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceCollectionInfo.java
index e7eeba950..b8b7f7ff3 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceCollectionInfo.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceCollectionInfo.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.model.info;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModel;
@@ -41,18 +42,19 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IModelInstanceCollectionInfo {
+// REFACTOR: parameterize the item type?
+public interface IModelInstanceCollectionInfo<ITEM> {
 
   @SuppressWarnings("PMD.ShortMethodName")
   @NonNull
-  static IModelInstanceCollectionInfo of(
-      @NonNull IBoundInstanceModel instance) {
+  static <T> IModelInstanceCollectionInfo<T> of(
+      @NonNull IBoundInstanceModel<T> instance) {
 
     // create the collection info
     Type type = instance.getType();
     Field field = instance.getField();
 
-    IModelInstanceCollectionInfo retval;
+    IModelInstanceCollectionInfo<T> retval;
     if (instance.getMaxOccurs() == -1 || instance.getMaxOccurs() > 1) {
       // collection case
       JsonGroupAsBehavior jsonGroupAs = instance.getJsonGroupAsBehavior();
@@ -89,7 +91,7 @@ static IModelInstanceCollectionInfo of(
               field.getType().getName(),
               Map.class.getName()));
         }
-        retval = new MapCollectionInfo(instance);
+        retval = new MapCollectionInfo<>(instance);
       } else {
         if (!List.class.isAssignableFrom(rawType)) {
           throw new IllegalArgumentException(String.format(
@@ -99,7 +101,7 @@ static IModelInstanceCollectionInfo of(
               field.getType().getName(),
               List.class.getName()));
         }
-        retval = new ListCollectionInfo(instance);
+        retval = new ListCollectionInfo<>(instance);
       }
     } else {
       // single value case
@@ -111,7 +113,7 @@ static IModelInstanceCollectionInfo of(
             field.getDeclaringClass().getName(),
             field.getType().getName()));
       }
-      retval = new SingletonCollectionInfo(instance);
+      retval = new SingletonCollectionInfo<>(instance);
     }
     return retval;
   }
@@ -122,7 +124,7 @@ static IModelInstanceCollectionInfo of(
    * @return the instance binding
    */
   @NonNull
-  IBoundInstanceModel getInstance();
+  IBoundInstanceModel<ITEM> getInstance();
 
   /**
    * Get the number of items associated with the value.
@@ -149,20 +151,20 @@ static IModelInstanceCollectionInfo of(
    * @return the raw type of the bound object
    */
   @NonNull
-  Class<?> getItemType();
+  Class<? extends ITEM> getItemType();
 
   @NonNull
-  default Collection<? extends Object> getItemsFromParentInstance(@NonNull Object parentInstance) {
+  default Collection<? extends ITEM> getItemsFromParentInstance(@NonNull Object parentInstance) {
     Object value = getInstance().getValue(parentInstance);
     return getItemsFromValue(value);
   }
 
   @NonNull
-  Collection<? extends Object> getItemsFromValue(Object value);
+  Collection<? extends ITEM> getItemsFromValue(Object value);
 
   Object emptyValue();
 
-  Object deepCopyItems(@NonNull Object fromObject, @NonNull Object toObject) throws BindingException;
+  Object deepCopyItems(@NonNull IBoundObject fromObject, @NonNull IBoundObject toObject) throws BindingException;
 
   /**
    * Read the value data for the model instance.
@@ -176,9 +178,9 @@ default Collection<? extends Object> getItemsFromParentInstance(@NonNull Object
    *           if there was an error when reading the data
    */
   @NonNull
-  Object readItems(@NonNull IModelInstanceReadHandler handler) throws IOException;
+  Object readItems(@NonNull IModelInstanceReadHandler<ITEM> handler) throws IOException;
 
-  <T> void writeItems(
-      @NonNull IModelInstanceWriteHandler handler,
+  void writeItems(
+      @NonNull IModelInstanceWriteHandler<ITEM> handler,
       @NonNull Object value) throws IOException;
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceReadHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceReadHandler.java
index 29aa20588..83ed85055 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceReadHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceReadHandler.java
@@ -33,17 +33,17 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-public interface IModelInstanceReadHandler {
+public interface IModelInstanceReadHandler<ITEM> {
   @Nullable
-  default Object readSingleton() throws IOException {
+  default ITEM readSingleton() throws IOException {
     return readItem();
   }
 
   @NonNull
-  List<?> readList() throws IOException;
+  List<ITEM> readList() throws IOException;
 
   @NonNull
-  Map<String, ?> readMap() throws IOException;
+  Map<String, ITEM> readMap() throws IOException;
 
   /**
    * Read the next item in the collection of items represented by the instance.
@@ -53,7 +53,7 @@ default Object readSingleton() throws IOException {
    * @throws IOException
    *           if an error occurred while parsing the input
    */
-  Object readItem() throws IOException;
+  ITEM readItem() throws IOException;
 
   @Nullable
   String getJsonKeyFlagName();
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceWriteHandler.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceWriteHandler.java
index 66e89dadc..8ca22eb62 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceWriteHandler.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/IModelInstanceWriteHandler.java
@@ -32,14 +32,14 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public interface IModelInstanceWriteHandler {
-  default void writeSingleton(@NonNull Object item) throws IOException {
+public interface IModelInstanceWriteHandler<ITEM> {
+  default void writeSingleton(@NonNull ITEM item) throws IOException {
     writeItem(item);
   }
 
-  void writeList(@NonNull List<?> items) throws IOException;
+  void writeList(@NonNull List<ITEM> items) throws IOException;
 
-  void writeMap(@NonNull Map<String, ?> items) throws IOException;
+  void writeMap(@NonNull Map<String, ITEM> items) throws IOException;
 
   /**
    * Write the next item in the collection of items represented by the instance.
@@ -49,5 +49,5 @@ default void writeSingleton(@NonNull Object item) throws IOException {
    * @throws IOException
    *           if an error occurred while parsing the input
    */
-  void writeItem(@NonNull Object item) throws IOException;
+  void writeItem(@NonNull ITEM item) throws IOException;
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/ListCollectionInfo.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/ListCollectionInfo.java
index 84505c9c4..2da9cc92b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/ListCollectionInfo.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/ListCollectionInfo.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.model.info;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
@@ -39,30 +40,32 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-class ListCollectionInfo
-    extends AbstractModelInstanceCollectionInfo {
+class ListCollectionInfo<ITEM>
+    extends AbstractModelInstanceCollectionInfo<ITEM> {
 
   public ListCollectionInfo(
-      @NonNull IBoundInstanceModel instance) {
+      @NonNull IBoundInstanceModel<ITEM> instance) {
     super(instance);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public Class<?> getItemType() {
+  public Class<? extends ITEM> getItemType() {
     ParameterizedType actualType = (ParameterizedType) getInstance().getType();
     // this is a List so there is only a single generic type
-    return ObjectUtils.notNull((Class<?>) actualType.getActualTypeArguments()[0]);
+    return ObjectUtils.notNull((Class<? extends ITEM>) actualType.getActualTypeArguments()[0]);
   }
 
   @Override
-  public List<? extends Object> getItemsFromParentInstance(Object parentInstance) {
+  public List<ITEM> getItemsFromParentInstance(Object parentInstance) {
     Object value = getInstance().getValue(parentInstance);
     return getItemsFromValue(value);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public List<? extends Object> getItemsFromValue(Object value) {
-    return value == null ? CollectionUtil.emptyList() : (List<?>) value;
+  public List<ITEM> getItemsFromValue(Object value) {
+    return value == null ? CollectionUtil.emptyList() : (List<ITEM>) value;
   }
 
   @Override
@@ -76,29 +79,30 @@ public boolean isEmpty(@Nullable Object value) {
   }
 
   @Override
-  public List<?> deepCopyItems(@NonNull Object fromInstance, @NonNull Object toInstance)
+  public List<ITEM> deepCopyItems(@NonNull IBoundObject fromInstance, @NonNull IBoundObject toInstance)
       throws BindingException {
-    IBoundInstanceModel instance = getInstance();
+    IBoundInstanceModel<ITEM> instance = getInstance();
 
-    List<Object> copy = emptyValue();
-    for (Object item : getItemsFromParentInstance(fromInstance)) {
+    List<ITEM> copy = emptyValue();
+    for (ITEM item : getItemsFromParentInstance(fromInstance)) {
       copy.add(instance.deepCopyItem(ObjectUtils.requireNonNull(item), toInstance));
     }
     return copy;
   }
 
   @Override
-  public List<Object> emptyValue() {
+  public List<ITEM> emptyValue() {
     return new LinkedList<>();
   }
 
   @Override
-  public List<?> readItems(IModelInstanceReadHandler handler) throws IOException {
+  public List<ITEM> readItems(IModelInstanceReadHandler<ITEM> handler) throws IOException {
     return handler.readList();
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public void writeItems(IModelInstanceWriteHandler handler, Object value) throws IOException {
-    handler.writeList((List<?>) value);
+  public void writeItems(IModelInstanceWriteHandler<ITEM> handler, Object value) throws IOException {
+    handler.writeList((List<ITEM>) value);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/MapCollectionInfo.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/MapCollectionInfo.java
index fca325ae9..648d2e0bd 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/MapCollectionInfo.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/MapCollectionInfo.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.model.info;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
@@ -41,16 +42,17 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-class MapCollectionInfo
-    extends AbstractModelInstanceCollectionInfo {
+class MapCollectionInfo<ITEM>
+    extends AbstractModelInstanceCollectionInfo<ITEM> {
 
-  public MapCollectionInfo(@NonNull IBoundInstanceModel instance) {
+  public MapCollectionInfo(@NonNull IBoundInstanceModel<ITEM> instance) {
     super(instance);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public Collection<?> getItemsFromValue(Object value) {
-    return value == null ? CollectionUtil.emptyList() : ObjectUtils.notNull(((Map<?, ?>) value).values());
+  public Collection<ITEM> getItemsFromValue(Object value) {
+    return value == null ? CollectionUtil.emptyList() : ObjectUtils.notNull(((Map<?, ITEM>) value).values());
   }
 
   @Override
@@ -72,31 +74,31 @@ public Class<?> getKeyType() {
   }
 
   @Override
-  public Class<?> getItemType() {
+  public Class<? extends ITEM> getItemType() {
     return getValueType();
   }
 
-  @SuppressWarnings("null")
+  @SuppressWarnings({ "null", "unchecked" })
   @NonNull
-  public Class<?> getValueType() {
+  public Class<? extends ITEM> getValueType() {
     ParameterizedType actualType = (ParameterizedType) getInstance().getType();
     // this is a Map so the second generic type is the value
-    return (Class<?>) actualType.getActualTypeArguments()[1];
+    return (Class<? extends ITEM>) actualType.getActualTypeArguments()[1];
   }
 
   @Override
-  public Map<String, ?> deepCopyItems(@NonNull Object fromInstance, @NonNull Object toInstance)
+  public Map<String, ITEM> deepCopyItems(@NonNull IBoundObject fromInstance, @NonNull IBoundObject toInstance)
       throws BindingException {
 
-    IBoundInstanceModel instance = getInstance();
-    Map<String, Object> copy = emptyValue();
-    for (Object item : getItemsFromParentInstance(fromInstance)) {
+    IBoundInstanceModel<ITEM> instance = getInstance();
+    Map<String, ITEM> copy = emptyValue();
+    for (ITEM item : getItemsFromParentInstance(fromInstance)) {
       assert item != null;
 
       IBoundInstanceFlag jsonKey = instance.getItemJsonKey(item);
       assert jsonKey != null;
 
-      Object itemCopy = instance.deepCopyItem(ObjectUtils.requireNonNull(item), toInstance);
+      ITEM itemCopy = instance.deepCopyItem(ObjectUtils.requireNonNull(item), toInstance);
       String key = ObjectUtils.requireNonNull(jsonKey.getValue(itemCopy)).toString();
       copy.put(key, itemCopy);
     }
@@ -104,20 +106,20 @@ public Class<?> getValueType() {
   }
 
   @Override
-  public Map<String, Object> emptyValue() {
+  public Map<String, ITEM> emptyValue() {
     return new LinkedHashMap<>();
   }
 
   @Override
-  public Map<String, ?> readItems(IModelInstanceReadHandler handler) throws IOException {
+  public Map<String, ITEM> readItems(IModelInstanceReadHandler<ITEM> handler) throws IOException {
     return handler.readMap();
   }
 
   @SuppressWarnings("unchecked")
   @Override
   public void writeItems(
-      IModelInstanceWriteHandler handler,
+      IModelInstanceWriteHandler<ITEM> handler,
       Object value) throws IOException {
-    handler.writeMap((Map<String, ?>) value);
+    handler.writeMap((Map<String, ITEM>) value);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/SingletonCollectionInfo.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/SingletonCollectionInfo.java
index 20f877e47..3a7cc8894 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/SingletonCollectionInfo.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/info/SingletonCollectionInfo.java
@@ -26,6 +26,7 @@
 
 package gov.nist.secauto.metaschema.databind.model.info;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.io.BindingException;
@@ -37,16 +38,17 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-class SingletonCollectionInfo
-    extends AbstractModelInstanceCollectionInfo {
+class SingletonCollectionInfo<ITEM>
+    extends AbstractModelInstanceCollectionInfo<ITEM> {
 
-  public SingletonCollectionInfo(@NonNull IBoundInstanceModel instance) {
+  public SingletonCollectionInfo(@NonNull IBoundInstanceModel<ITEM> instance) {
     super(instance);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public List<?> getItemsFromValue(Object value) {
-    return value == null ? CollectionUtil.emptyList() : CollectionUtil.singletonList(value);
+  public List<ITEM> getItemsFromValue(Object value) {
+    return value == null ? CollectionUtil.emptyList() : CollectionUtil.singletonList((ITEM) value);
   }
 
   @Override
@@ -59,34 +61,38 @@ public boolean isEmpty(@Nullable Object value) {
     return value == null;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public Class<?> getItemType() {
-    return getInstance().getItemType();
+  public Class<? extends ITEM> getItemType() {
+    return (Class<? extends ITEM>) getInstance().getItemType();
   }
 
   @Override
-  public Object deepCopyItems(@NonNull Object fromObject, @NonNull Object toObject)
+  public Object deepCopyItems(@NonNull IBoundObject fromObject, @NonNull IBoundObject toObject)
       throws BindingException {
-    IBoundInstanceModel instance = getInstance();
+    IBoundInstanceModel<ITEM> instance = getInstance();
 
-    Object value = instance.getValue(fromObject);
+    @SuppressWarnings("unchecked") ITEM value = (ITEM) instance.getValue(fromObject);
 
     return value == null ? null : instance.deepCopyItem(ObjectUtils.requireNonNull(value), toObject);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public Object emptyValue() {
-    return getInstance().getDefaultValue();
+  public ITEM emptyValue() {
+    return (ITEM) getInstance().getDefaultValue();
   }
 
   @Override
-  public Object readItems(IModelInstanceReadHandler handler) throws IOException {
+  public Object readItems(IModelInstanceReadHandler<ITEM> handler) throws IOException {
     Object value = handler.readSingleton();
+    // REFACTOR: this can return a null value
     return value == null ? emptyValue() : value;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public void writeItems(IModelInstanceWriteHandler handler, Object value) throws IOException {
-    handler.writeSingleton(value);
+  public void writeItems(IModelInstanceWriteHandler<ITEM> handler, Object value) throws IOException {
+    handler.writeSingleton((ITEM) value);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoader.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoader.java
index d72d23c57..5a0c2b636 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoader.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingConstraintLoader.java
@@ -27,7 +27,6 @@
 package gov.nist.secauto.metaschema.databind.model.metaschema;
 
 import gov.nist.secauto.metaschema.core.metapath.MetapathException;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.AbstractLoader;
 import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
 import gov.nist.secauto.metaschema.core.model.IConstraintLoader;
@@ -56,9 +55,11 @@
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.io.DeserializationFeature;
 import gov.nist.secauto.metaschema.databind.io.IBoundLoader;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetapathContext;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaMetaConstraints;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyConstraints;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.MetapathContext;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.MetaschemaMetaConstraints;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.MetaschemaMetapath;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.MetaschemaModuleConstraints;
 import gov.nist.secauto.metaschema.databind.model.metaschema.impl.ConstraintBindingSupport;
 
 import org.apache.xmlbeans.impl.values.XmlValueNotSupportedException;
@@ -142,7 +143,7 @@ protected IConstraintSet parseResource(@NonNull URI resource, @NonNull Deque<URI
     } else if (constraintsDocument instanceof MetaschemaMetaConstraints) {
       MetaschemaMetaConstraints obj = (MetaschemaMetaConstraints) constraintsDocument;
 
-      List<ITargetedConstraints> targetedConstraints = CollectionUtil.listOrEmpty(obj.getMetapathContexts()).stream()
+      List<ITargetedConstraints> targetedConstraints = CollectionUtil.listOrEmpty(obj.getContexts()).stream()
           .flatMap(context -> parseContext(ObjectUtils.notNull(context), null, source)
               .getTargetedConstraints().stream())
           .collect(Collectors.toList());
@@ -174,7 +175,7 @@ protected List<IScopedContraints> parseScopedConstraints(
 
       List<ITargetedConstraints> targetedConstraints = new LinkedList<>();
       try {
-        for (Object constraintsObj : CollectionUtil.listOrEmpty(scope.getConstraints())) {
+        for (IValueConstraintsBase constraintsObj : CollectionUtil.listOrEmpty(scope.getConstraints())) {
           if (constraintsObj instanceof MetaschemaModuleConstraints.Scope.Assembly) {
             targetedConstraints.add(handleScopedAssembly(
                 (MetaschemaModuleConstraints.Scope.Assembly) constraintsObj,
@@ -214,33 +215,33 @@ protected List<IScopedContraints> parseScopedConstraints(
   private static AssemblyTargetedConstraints handleScopedAssembly(
       @NonNull MetaschemaModuleConstraints.Scope.Assembly obj,
       @NonNull ISource source) {
-    MetapathExpression expression = MetapathExpression.compile(ObjectUtils.requireNonNull(obj.getTarget()));
-
     IModelConstrained constraints = new AssemblyConstraintSet();
     ConstraintBindingSupport.parse(constraints, obj, source);
-    return new AssemblyTargetedConstraints(expression, constraints);
+    return new AssemblyTargetedConstraints(
+        ObjectUtils.requireNonNull(obj.getTarget()),
+        constraints);
   }
 
   private static FieldTargetedConstraints handleScopedField(
       @NonNull MetaschemaModuleConstraints.Scope.Field obj,
       @NonNull ISource source) {
-    MetapathExpression expression = MetapathExpression.compile(ObjectUtils.requireNonNull(obj.getTarget()));
-
     IValueConstrained constraints = new ValueConstraintSet();
     ConstraintBindingSupport.parse(constraints, obj, source);
 
-    return new FieldTargetedConstraints(expression, constraints);
+    return new FieldTargetedConstraints(
+        ObjectUtils.requireNonNull(obj.getTarget()),
+        constraints);
   }
 
   private static FlagTargetedConstraints handleScopedFlag(
       @NonNull MetaschemaModuleConstraints.Scope.Flag obj,
       @NonNull ISource source) {
-    MetapathExpression expression = MetapathExpression.compile(ObjectUtils.requireNonNull(obj.getTarget()));
-
     IValueConstrained constraints = new ValueConstraintSet();
     ConstraintBindingSupport.parse(constraints, obj, source);
 
-    return new FlagTargetedConstraints(expression, constraints);
+    return new FlagTargetedConstraints(
+        ObjectUtils.requireNonNull(obj.getTarget()),
+        constraints);
   }
 
   private Context parseContext(
@@ -251,25 +252,26 @@ private Context parseContext(
     List<String> metapaths;
     if (parent == null) {
       metapaths = CollectionUtil.listOrEmpty(contextObj.getMetapaths()).stream()
-          .map(metapath -> metapath.getTarget())
+          .map(MetaschemaMetapath::getTarget)
           .collect(Collectors.toList());
     } else {
       List<String> parentMetapaths = parent.getMetapaths().stream()
           .collect(Collectors.toList());
       metapaths = CollectionUtil.listOrEmpty(contextObj.getMetapaths()).stream()
-          .map(metapath -> metapath.getTarget())
-          .flatMap(childPath -> {
-            return parentMetapaths.stream()
-                .map(parentPath -> parentPath + '/' + childPath);
-          })
+          .map(MetaschemaMetapath::getTarget)
+          .flatMap(childPath -> parentMetapaths.stream()
+              .map(parentPath -> parentPath + '/' + childPath))
           .collect(Collectors.toList());
     }
 
+    AssemblyConstraints contextConstraints = contextObj.getConstraints();
     IModelConstrained constraints = new AssemblyConstraintSet();
-    ConstraintBindingSupport.parse(constraints, ObjectUtils.notNull(contextObj.getConstraints()), source);
+    if (contextConstraints != null) {
+      ConstraintBindingSupport.parse(constraints, contextConstraints, source);
+    }
     Context context = new Context(metapaths, constraints);
 
-    List<Context> childContexts = CollectionUtil.listOrEmpty(contextObj.getMetapathContexts()).stream()
+    List<Context> childContexts = CollectionUtil.listOrEmpty(contextObj.getContexts()).stream()
         .map(childObj -> parseContext(ObjectUtils.notNull(childObj), context, source))
         .collect(Collectors.toList());
 
@@ -282,8 +284,6 @@ private static class Context {
     @NonNull
     private final List<String> metapaths;
     @NonNull
-    private final IModelConstrained constraints;
-    @NonNull
     private final List<Context> childContexts = new LinkedList<>();
     @NonNull
     private final Lazy<List<ITargetedConstraints>> targetedConstraints;
@@ -292,23 +292,21 @@ public Context(
         @NonNull List<String> metapaths,
         @NonNull IModelConstrained constraints) {
       this.metapaths = metapaths;
-      this.constraints = constraints;
-      this.targetedConstraints = Lazy.lazy(() -> {
+      this.targetedConstraints = ObjectUtils.notNull(Lazy.lazy(() -> {
 
         Stream<ITargetedConstraints> paths = getMetapaths().stream()
-            .map(metapath -> MetapathExpression.compile(ObjectUtils.notNull(metapath)))
-            .map(compiledMetapath -> new MetaTargetedContraints(ObjectUtils.notNull(compiledMetapath), constraints));
+            .map(metapath -> new MetaTargetedContraints(ObjectUtils.notNull(metapath), constraints));
         Stream<ITargetedConstraints> childPaths = childContexts.stream()
             .flatMap(child -> child.getTargetedConstraints().stream());
 
         return Stream.concat(paths, childPaths)
             .collect(Collectors.toUnmodifiableList());
-      });
+      }));
     }
 
     @NonNull
     public List<ITargetedConstraints> getTargetedConstraints() {
-      return targetedConstraints.get();
+      return ObjectUtils.notNull(targetedConstraints.get());
     }
 
     public void addAll(@NonNull Collection<Context> childContexts) {
@@ -326,7 +324,7 @@ private static class MetaTargetedContraints
       implements IFeatureModelConstrained {
 
     protected MetaTargetedContraints(
-        @NonNull MetapathExpression target,
+        @NonNull String target,
         @NonNull IModelConstrained constraints) {
       super(target, constraints);
     }
@@ -340,20 +338,19 @@ protected MetaTargetedContraints(
      * @param definition
      *          the definition to apply the constraints to.
      */
-    @SuppressWarnings("null")
     protected void applyTo(@NonNull IDefinition definition) {
-      getAllowedValuesConstraints().forEach(constraint -> definition.addConstraint(constraint));
-      getMatchesConstraints().forEach(constraint -> definition.addConstraint(constraint));
-      getIndexHasKeyConstraints().forEach(constraint -> definition.addConstraint(constraint));
-      getExpectConstraints().forEach(constraint -> definition.addConstraint(constraint));
+      getLetExpressions().values().forEach(definition::addLetExpression);
+      getAllowedValuesConstraints().forEach(definition::addConstraint);
+      getMatchesConstraints().forEach(definition::addConstraint);
+      getIndexHasKeyConstraints().forEach(definition::addConstraint);
+      getExpectConstraints().forEach(definition::addConstraint);
     }
 
-    @SuppressWarnings("null")
     protected void applyTo(@NonNull IAssemblyDefinition definition) {
       applyTo((IDefinition) definition);
-      getIndexConstraints().forEach(constraint -> definition.addConstraint(constraint));
-      getUniqueConstraints().forEach(constraint -> definition.addConstraint(constraint));
-      getHasCardinalityConstraints().forEach(constraint -> definition.addConstraint(constraint));
+      getIndexConstraints().forEach(definition::addConstraint);
+      getUniqueConstraints().forEach(definition::addConstraint);
+      getHasCardinalityConstraints().forEach(definition::addConstraint);
     }
 
     @Override
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingModuleLoader.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingModuleLoader.java
index 7b45aa481..88af0a4de 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingModuleLoader.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/BindingModuleLoader.java
@@ -29,6 +29,7 @@
 import gov.nist.secauto.metaschema.core.configuration.IConfiguration;
 import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
 import gov.nist.secauto.metaschema.core.model.AbstractModuleLoader;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.IModuleLoader;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
@@ -37,7 +38,8 @@
 import gov.nist.secauto.metaschema.databind.io.DeserializationFeature;
 import gov.nist.secauto.metaschema.databind.io.IBoundLoader;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.METASCHEMA;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.METASCHEMA.Import;
 import gov.nist.secauto.metaschema.databind.model.metaschema.impl.BindingModule;
 
 import java.io.IOException;
@@ -49,7 +51,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class BindingModuleLoader
-    extends AbstractModuleLoader<METASCHEMA, IBindingModule>
+    extends AbstractModuleLoader<METASCHEMA, IMetaschemaModule>
     implements IMutableConfiguration<DeserializationFeature<?>> {
   @NonNull
   private final IBoundLoader loader;
@@ -78,7 +80,10 @@ public BindingModuleLoader(@NonNull List<IModuleLoader.IModulePostProcessor> mod
   }
 
   @Override
-  protected IBindingModule newModule(URI resource, METASCHEMA binding, List<IBindingModule> importedModules)
+  protected IMetaschemaModule newModule(
+      URI resource,
+      METASCHEMA binding,
+      List<? extends IMetaschemaModule> importedModules)
       throws MetaschemaException {
     return new BindingModule(
         resource,
@@ -92,7 +97,7 @@ protected IBindingModule newModule(URI resource, METASCHEMA binding, List<IBindi
   @Override
   protected List<URI> getImports(METASCHEMA binding) {
     return ObjectUtils.notNull(binding.getImports().stream()
-        .map(imported -> imported.getHref())
+        .map(Import::getHref)
         .collect(Collectors.toUnmodifiableList()));
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingContainerModelAbsolute.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingContainerModelAbsolute.java
deleted file mode 100644
index 98821f802..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingContainerModelAbsolute.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute;
-
-import java.util.Collection;
-
-public interface IBindingContainerModelAbsolute extends IContainerModelAbsolute {
-
-  @Override
-  IBindingDefinitionAssembly getOwningDefinition();
-
-  @Override
-  Collection<? extends IBindingInstanceModelAbsolute> getModelInstances();
-
-  @Override
-  Collection<? extends IBindingInstanceModelNamedAbsolute> getNamedModelInstances();
-
-  @Override
-  IBindingInstanceModelNamedAbsolute getNamedModelInstanceByName(String name);
-
-  @Override
-  Collection<? extends IBindingInstanceModelFieldAbsolute> getFieldInstances();
-
-  @Override
-  IBindingInstanceModelFieldAbsolute getFieldInstanceByName(String name);
-
-  @Override
-  Collection<? extends IBindingInstanceModelAssemblyAbsolute> getAssemblyInstances();
-
-  @Override
-  IBindingInstanceModelAssemblyAbsolute getAssemblyInstanceByName(String name);
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinition.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinition.java
deleted file mode 100644
index 1265b71e3..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinition.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IDefinition;
-
-public interface IBindingDefinition extends IBindingModelElement, IDefinition {
-  @Override
-  IBindingModule getContainingModule();
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionFlag.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionFlag.java
deleted file mode 100644
index ee6f5e956..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionFlag.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
-
-public interface IBindingDefinitionFlag extends IFlagDefinition, IBindingDefinition {
-  // no additional methods
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModel.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModel.java
deleted file mode 100644
index eb6bb5478..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModel.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IModelDefinition;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-
-import java.util.Collection;
-
-import edu.umd.cs.findbugs.annotations.Nullable;
-
-public interface IBindingDefinitionModel
-    extends IBindingDefinition, IModelDefinition {
-  @Override
-  IBindingInstanceFlag getFlagInstanceByName(String name);
-
-  @Override
-  Collection<IBindingInstanceFlag> getFlagInstances();
-
-  @Nullable
-  String getJsonKeyFlagName();
-
-  @Override
-  default IBindingInstanceFlag getJsonKeyFlagInstance() {
-    String name = getJsonKeyFlagName();
-    return name == null ? null : ObjectUtils.requireNonNull(getFlagInstanceByName(name));
-  }
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAbsolute.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAbsolute.java
deleted file mode 100644
index 28c6a7601..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAbsolute.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
-
-public interface IBindingInstanceModelAbsolute extends IModelInstanceAbsolute, IBindingInstanceModel {
-  // no additional methods
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAssembly.java
deleted file mode 100644
index d117a0af3..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAssembly.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IAssemblyInstance;
-
-public interface IBindingInstanceModelAssembly
-    extends IAssemblyInstance, IBindingInstanceModelNamed {
-  // no additional methods
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAssemblyAbsolute.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAssemblyAbsolute.java
deleted file mode 100644
index 0beeec970..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAssemblyAbsolute.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
-
-public interface IBindingInstanceModelAssemblyAbsolute
-    extends IBindingInstanceModelAssembly, IAssemblyInstanceAbsolute, IBindingInstanceModelNamedAbsolute {
-  // no additional methods
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAssemblyGrouped.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAssemblyGrouped.java
deleted file mode 100644
index 76d3c8747..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelAssemblyGrouped.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped;
-
-public interface IBindingInstanceModelAssemblyGrouped
-    extends IBindingInstanceModelAssembly, IAssemblyInstanceGrouped, IBindingInstanceModelNamedGrouped {
-  // no additional methods
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelField.java
deleted file mode 100644
index 028c29aa0..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelField.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IFieldInstance;
-
-public interface IBindingInstanceModelField extends IFieldInstance, IBindingInstanceModelNamed {
-  // no additional methods
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelFieldAbsolute.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelFieldAbsolute.java
deleted file mode 100644
index 9377a27c8..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelFieldAbsolute.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
-
-public interface IBindingInstanceModelFieldAbsolute
-    extends IBindingInstanceModelField, IFieldInstanceAbsolute, IBindingInstanceModelNamedAbsolute {
-  // no additional methods
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelFieldGrouped.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelFieldGrouped.java
deleted file mode 100644
index b1885edd4..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelFieldGrouped.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped;
-
-public interface IBindingInstanceModelFieldGrouped
-    extends IBindingInstanceModelField, IFieldInstanceGrouped, IBindingInstanceModelNamedGrouped {
-  // no additional methods
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelNamed.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelNamed.java
deleted file mode 100644
index 0705527a7..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelNamed.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.INamedModelInstance;
-
-public interface IBindingInstanceModelNamed extends IBindingInstanceModel, INamedModelInstance {
-  // no additional methods
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelNamedAbsolute.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelNamedAbsolute.java
deleted file mode 100644
index eef878a43..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelNamedAbsolute.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
-
-public interface IBindingInstanceModelNamedAbsolute
-    extends IBindingInstanceModelNamed, IBindingInstanceModelAbsolute, INamedModelInstanceAbsolute {
-  // no additional methods
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelNamedGrouped.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelNamedGrouped.java
deleted file mode 100644
index 19182e389..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingInstanceModelNamedGrouped.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped;
-
-public interface IBindingInstanceModelNamedGrouped extends IBindingInstanceModelNamed, INamedModelInstanceGrouped {
-  @Override
-  IBindingDefinitionAssembly getContainingDefinition();
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModelElement.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModelElement.java
deleted file mode 100644
index 742350aff..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModelElement.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IModelElement;
-
-public interface IBindingModelElement extends IBinding, IModelElement {
-  @Override
-  IBindingModule getContainingModule();
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModule.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModule.java
deleted file mode 100644
index ed2b1baea..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingModule.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
-import gov.nist.secauto.metaschema.core.model.IModuleExtended;
-
-public interface IBindingModule
-    extends IModuleExtended<
-        IBindingModule,
-        IBindingDefinitionModel,
-        IBindingDefinitionFlag,
-        IBindingDefinitionModelField,
-        IBindingDefinitionAssembly>,
-    IBinding {
-
-  @Override
-  IDocumentNodeItem getBoundNodeItem();
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IConstraintBase.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IConstraintBase.java
index 74d803242..b365c39f1 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IConstraintBase.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IConstraintBase.java
@@ -27,8 +27,8 @@
 package gov.nist.secauto.metaschema.databind.model.metaschema;
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Remarks;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.Property;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.Remarks;
 
 import java.util.List;
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueConstraintsBase.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueConstraintsBase.java
index b1ee57afc..81dccb38d 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueConstraintsBase.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueConstraintsBase.java
@@ -26,11 +26,12 @@
 
 package gov.nist.secauto.metaschema.databind.model.metaschema;
 
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.ConstraintLetExpression;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.ConstraintLetExpression;
 
 import java.util.List;
 
-public interface IValueConstraintsBase {
+public interface IValueConstraintsBase extends IBoundObject {
   List<ConstraintLetExpression> getLets();
 
   List<? extends IConstraintBase> getRules();
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IInstanceModelChoiceGroupBinding.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueTargetedConstraintsBase.java
similarity index 86%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IInstanceModelChoiceGroupBinding.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueTargetedConstraintsBase.java
index e441b0776..439efbf77 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IInstanceModelChoiceGroupBinding.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IValueTargetedConstraintsBase.java
@@ -26,13 +26,14 @@
 
 package gov.nist.secauto.metaschema.databind.model.metaschema;
 
-import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.ConstraintLetExpression;
 
-public interface IInstanceModelChoiceGroupBinding extends IBindingInstanceModelAbsolute, IChoiceGroupInstance {
+import java.util.List;
 
+public interface IValueTargetedConstraintsBase extends IValueConstraintsBase {
   @Override
-  IBindingDefinitionAssembly getOwningDefinition();
+  List<ConstraintLetExpression> getLets();
 
   @Override
-  IBindingDefinitionAssembly getContainingDefinition();
+  List<? extends ITargetedConstraintBase> getRules();
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractBindingModelContainerSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractBindingModelContainerSupport.java
index 3cd495f1e..7b6ed61f3 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractBindingModelContainerSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractBindingModelContainerSupport.java
@@ -26,65 +26,68 @@
 
 package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
 
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute;
 import gov.nist.secauto.metaschema.core.model.IContainerModelSupport;
+import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IModule;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingContainerModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelField;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyReference;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldReference;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyReference;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FieldReference;
 
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public abstract class AbstractBindingModelContainerSupport
     implements IContainerModelSupport<
-        IBindingInstanceModelAbsolute,
-        IBindingInstanceModelNamedAbsolute,
-        IBindingInstanceModelFieldAbsolute,
-        IBindingInstanceModelAssemblyAbsolute> {
+        IModelInstanceAbsolute,
+        INamedModelInstanceAbsolute,
+        IFieldInstanceAbsolute,
+        IAssemblyInstanceAbsolute> {
 
   protected static void addInstance(
-      @NonNull IBindingInstanceModelAssemblyAbsolute assembly,
-      @NonNull List<IBindingInstanceModelAbsolute> modelInstances,
-      @NonNull Map<String, IBindingInstanceModelNamedAbsolute> namedModelInstances,
-      @NonNull Map<String, IBindingInstanceModelAssemblyAbsolute> assemblyInstances) {
-    String effectiveName = assembly.getEffectiveName();
+      @NonNull IAssemblyInstanceAbsolute assembly,
+      @NonNull List<IModelInstanceAbsolute> modelInstances,
+      @NonNull Map<QName, INamedModelInstanceAbsolute> namedModelInstances,
+      @NonNull Map<QName, IAssemblyInstanceAbsolute> assemblyInstances) {
+    QName effectiveName = assembly.getXmlQName();
     modelInstances.add(assembly);
     namedModelInstances.put(effectiveName, assembly);
     assemblyInstances.put(effectiveName, assembly);
   }
 
   protected static void addInstance(
-      @NonNull IBindingInstanceModelFieldAbsolute field,
-      @NonNull List<IBindingInstanceModelAbsolute> modelInstances,
-      @NonNull Map<String, IBindingInstanceModelNamedAbsolute> namedModelInstances,
-      @NonNull Map<String, IBindingInstanceModelFieldAbsolute> fieldInstances) {
-    String effectiveName = field.getEffectiveName();
+      @NonNull IFieldInstanceAbsolute field,
+      @NonNull List<IModelInstanceAbsolute> modelInstances,
+      @NonNull Map<QName, INamedModelInstanceAbsolute> namedModelInstances,
+      @NonNull Map<QName, IFieldInstanceAbsolute> fieldInstances) {
+    QName effectiveName = field.getXmlQName();
     modelInstances.add(field);
     namedModelInstances.put(effectiveName, field);
     fieldInstances.put(effectiveName, field);
   }
 
   @NonNull
-  protected static IBindingInstanceModelAssemblyAbsolute newInstance(
+  protected static IAssemblyInstanceAbsolute newInstance(
       @NonNull AssemblyReference obj,
       @NonNull IBoundInstanceModelGroupedAssembly objInstance,
       int position,
-      @NonNull IBindingContainerModelAbsolute parent) {
-    IBindingDefinitionAssembly owningDefinition = parent.getOwningDefinition();
-    IBindingModule module = owningDefinition.getContainingModule();
+      @NonNull IContainerModelAbsolute parent) {
+    IAssemblyDefinition owningDefinition = parent.getOwningDefinition();
+    IModule module = owningDefinition.getContainingModule();
 
     String name = ObjectUtils.requireNonNull(obj.getRef());
-    IBindingDefinitionAssembly definition = module.getScopedAssemblyDefinitionByName(name);
+    IAssemblyDefinition definition = module.getScopedAssemblyDefinitionByName(
+        module.toModelQName(name));
 
     if (definition == null) {
       throw new IllegalStateException(
@@ -97,16 +100,17 @@ protected static IBindingInstanceModelAssemblyAbsolute newInstance(
   }
 
   @NonNull
-  protected static IBindingInstanceModelFieldAbsolute newInstance(
+  protected static IFieldInstanceAbsolute newInstance(
       @NonNull FieldReference obj,
       @NonNull IBoundInstanceModelGroupedAssembly objInstance,
       int position,
-      @NonNull IBindingContainerModelAbsolute parent) {
-    IBindingDefinitionAssembly owningDefinition = parent.getOwningDefinition();
-    IBindingModule module = owningDefinition.getContainingModule();
+      @NonNull IContainerModelAbsolute parent) {
+    IAssemblyDefinition owningDefinition = parent.getOwningDefinition();
+    IModule module = owningDefinition.getContainingModule();
 
     String name = ObjectUtils.requireNonNull(obj.getRef());
-    IBindingDefinitionModelField definition = module.getScopedFieldDefinitionByName(name);
+    IFieldDefinition definition = module.getScopedFieldDefinitionByName(
+        module.toModelQName(name));
     if (definition == null) {
       throw new IllegalStateException(
           String.format("Unable to resolve field reference '%s' in definition '%s' in module '%s'",
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractGroupedAssemblyInstanceNodeItem.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractGroupedAssemblyInstanceNodeItem.java
deleted file mode 100644
index 621e2e9b9..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractGroupedAssemblyInstanceNodeItem.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
-
-// REFACTOR: Check if this is used, delete?
-// public abstract class AbstractGroupedAssemblyInstanceNodeItem
-// extends AbstractGroupedModelInstanceNodeItem<IAssemblyDefinition,
-// IAssemblyInstance>
-// implements IAssemblyInstanceGroupedNodeItem, IFeatureModelContainerItem {
-// protected AbstractGroupedAssemblyInstanceNodeItem(
-// @NonNull IAssemblyInstanceGrouped instance,
-// int position,
-// @NonNull INodeItemGenerator generator) {
-// super(instance, position);
-// this.model =
-// ObjectUtils.notNull(Lazy.lazy(generator.newDataModelSupplier(this)));
-// }
-//
-// @NonNull
-// private final Lazy<IFeatureModelContainerItem.ModelContainer> model;
-//
-// @SuppressWarnings("null")
-// @Override
-// public ModelContainer getModel() {
-// return model.get();
-// }
-// }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractGroupedModelInstanceNodeItem.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractGroupedModelInstanceNodeItem.java
deleted file mode 100644
index 2ce1c6a01..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractGroupedModelInstanceNodeItem.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
-
-// REFACTOR: Check if this is used, delete?
-// public abstract class AbstractGroupedModelInstanceNodeItem<
-// D extends IModelDefinition,
-// I extends INamedModelInstance,
-// T>
-// implements IModelNodeItem<D, I> {
-// private final int position;
-// @NonNull
-// private final I instance;
-// @NonNull
-// private final T value;
-//
-// protected AbstractGroupedModelInstanceNodeItem(
-// @NonNull I instance,
-// int position,
-// @NonNull T value) {
-// this.position = position;
-// this.instance = instance;
-// this.value = value;
-// }
-//
-// @Override
-// public int getPosition() {
-// return position;
-// }
-//
-// @SuppressWarnings("unchecked")
-// @Override
-// public D getDefinition() {
-// return (D) getInstance().getDefinition();
-// }
-//
-// @Override
-// public I getInstance() {
-// return instance;
-// }
-//
-// @Override
-// @NonNull
-// public Object getValue() {
-// return value;
-// }
-// }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstance.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstance.java
deleted file mode 100644
index fea395302..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstance.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
-
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstance;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public abstract class AbstractInstance<BINDING>
-    extends AbstractBinding<BINDING>
-    implements IBindingInstance, IFeatureValueless {
-  @NonNull
-  private final IBindingDefinitionModel parent;
-
-  protected AbstractInstance(
-      @NonNull BINDING binding,
-      @NonNull IBindingDefinitionModel parent) {
-    super(binding);
-    this.parent = parent;
-  }
-
-  @Override
-  public IBindingDefinitionModel getParentContainer() {
-    return parent;
-  }
-
-  @Override
-  public IBindingDefinitionModel getContainingDefinition() {
-    return parent;
-  }
-
-  @Override
-  public IBindingModule getContainingModule() {
-    return getContainingDefinition().getContainingModule();
-  }
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModel.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModel.java
deleted file mode 100644
index 59ac912aa..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModel.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
-
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingContainerModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-public abstract class AbstractInstanceModel<BINDING, PARENT extends IBindingContainerModelAbsolute>
-    extends AbstractBinding<BINDING>
-    implements IBindingInstanceModelAbsolute,
-    IFeatureValueless {
-  @NonNull
-  private final PARENT parent;
-
-  protected AbstractInstanceModel(
-      @NonNull BINDING binding,
-      @NonNull PARENT parent) {
-    super(binding);
-    this.parent = parent;
-  }
-
-  @Override
-  public PARENT getParentContainer() {
-    return parent;
-  }
-
-  @Override
-  public IBindingDefinitionAssembly getContainingDefinition() {
-    return getParentContainer().getOwningDefinition();
-  }
-
-  @Override
-  public IBindingModule getContainingModule() {
-    return getContainingDefinition().getContainingModule();
-  }
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelGrouped.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelGrouped.java
deleted file mode 100644
index df3c4e9b1..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelGrouped.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
-
-import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
-import gov.nist.secauto.metaschema.core.model.IAttributable;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedGrouped;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceGroupBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import nl.talsmasoftware.lazy4j.Lazy;
-
-public abstract class AbstractInstanceModelGrouped<
-    BINDING>
-    extends AbstractBinding<BINDING>
-    implements IBindingInstanceModelNamedGrouped,
-    IFeatureValueless {
-  @NonNull
-  private final IInstanceModelChoiceGroupBinding parent;
-  @NonNull
-  private final Map<IAttributable.Key, Set<String>> properties;
-  @NonNull
-  private final Lazy<IAssemblyNodeItem> boundNodeItem;
-
-  protected AbstractInstanceModelGrouped(
-      @NonNull BINDING binding,
-      @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
-      int position,
-      @NonNull IInstanceModelChoiceGroupBinding parent,
-      @NonNull List<Property> properties) {
-    super(binding);
-    this.parent = parent;
-    this.properties = ModelSupport.parseProperties(properties);
-    this.boundNodeItem = ObjectUtils.notNull(
-        Lazy.lazy(() -> (IAssemblyNodeItem) getContainingDefinition().getBoundNodeItem()
-            .getModelItemsByName(bindingInstance.getEffectiveName())
-            .get(position)));
-  }
-
-  @Override
-  public IInstanceModelChoiceGroupBinding getParentContainer() {
-    return parent;
-  }
-
-  @Override
-  public Map<IAttributable.Key, Set<String>> getProperties() {
-    return properties;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public INodeItem getBoundNodeItem() {
-    return boundNodeItem.get();
-  }
-
-  @Override
-  public IBindingDefinitionAssembly getContainingDefinition() {
-    return getParentContainer().getOwningDefinition();
-  }
-
-  @Override
-  public String getJsonKeyFlagName() {
-    return getParentContainer().getJsonKeyFlagName();
-  }
-
-  @Override
-  public IBindingModule getContainingModule() {
-    return getContainingDefinition().getContainingModule();
-  }
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelNamed.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelNamed.java
deleted file mode 100644
index 857b57ec2..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelNamed.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
-
-import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
-import gov.nist.secauto.metaschema.core.model.IAttributable;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.IGroupAs;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingContainerModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.GroupAs;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-import nl.talsmasoftware.lazy4j.Lazy;
-
-/**
- * Implements a named model instance associated with a Java object binding.
- *
- * @param <BINDING>
- *          the Java type of the associated object binding
- * @param <PARENT>
- *          the Java type of the parent container
- */
-public abstract class AbstractInstanceModelNamed<
-    BINDING,
-    PARENT extends IBindingContainerModelAbsolute>
-    extends AbstractInstanceModel<BINDING, PARENT>
-    implements IBindingInstanceModelNamedAbsolute,
-    IFeatureInstanceModelGroupAs {
-  @NonNull
-  private final Map<IAttributable.Key, Set<String>> properties;
-  @NonNull
-  private final IGroupAs groupAs;
-  @NonNull
-  private final Lazy<IAssemblyNodeItem> boundNodeItem;
-
-  /**
-   * Construct a new bound named instance.
-   *
-   * @param binding
-   *          the instance object bound to a Java class
-   * @param bindingInstance
-   *          the Metaschema module instance for the bound object
-   * @param position
-   *          the zero-based position of this bound object relative to its bound
-   *          object siblings
-   * @param parent
-   *          the container containing this binding
-   * @param properties
-   *          the collection of properties associated with this instance, which
-   *          may be empty
-   * @param groupAs
-   *          the instance grouping information
-   */
-  protected AbstractInstanceModelNamed(
-      @NonNull BINDING binding,
-      @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
-      int position,
-      @NonNull PARENT parent,
-      @NonNull List<Property> properties,
-      @Nullable GroupAs groupAs) {
-    super(binding, parent);
-    this.properties = ModelSupport.parseProperties(properties);
-    this.groupAs = ModelSupport.groupAs(groupAs);
-    this.boundNodeItem = ObjectUtils.notNull(
-        Lazy.lazy(() -> (IAssemblyNodeItem) getContainingDefinition().getBoundNodeItem()
-            .getModelItemsByName(bindingInstance.getEffectiveName())
-            .get(position)));
-  }
-
-  @Override
-  public Map<IAttributable.Key, Set<String>> getProperties() {
-    return properties;
-  }
-
-  @Override
-  public IGroupAs getGroupAs() {
-    return groupAs;
-  }
-
-  @SuppressWarnings("null")
-  @Override
-  public INodeItem getBoundNodeItem() {
-    return boundNodeItem.get();
-  }
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelNamedInline.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelNamedInline.java
deleted file mode 100644
index 8d378865e..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelNamedInline.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
-
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingContainerModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.GroupAs;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property;
-
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
-public abstract class AbstractInstanceModelNamedInline<
-    BINDING,
-    PARENT extends IBindingContainerModelAbsolute>
-    extends AbstractInstanceModelNamed<BINDING, PARENT> {
-
-  /**
-   * Construct a new bound named instance that represents an inline definition.
-   *
-   * @param binding
-   *          the instance object bound to a Java class
-   * @param bindingInstance
-   *          the Metaschema module instance for the bound object
-   * @param position
-   *          the zero-based position of this bound object relative to its bound
-   *          object siblings
-   * @param parent
-   *          the container containing this binding
-   * @param properties
-   *          the collection of properties associated with this instance, which
-   *          may be empty
-   * @param groupAs
-   *          the instance grouping information
-   */
-  protected AbstractInstanceModelNamedInline(
-      @NonNull BINDING binding,
-      @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
-      int position,
-      @NonNull PARENT parent,
-      @NonNull List<Property> properties,
-      @Nullable GroupAs groupAs) {
-    super(binding, bindingInstance, position, parent, properties, groupAs);
-  }
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelNamedReference.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelNamedReference.java
deleted file mode 100644
index 94dbd12e2..000000000
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AbstractInstanceModelNamedReference.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
-
-import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingContainerModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.GroupAs;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property;
-
-import java.util.List;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
-/**
- * Implements a named model instance, referencing a global definition,
- * associated with a Java object binding.
- *
- * @param <BINDING>
- *          the Java type of the associated object binding
- * @param <DEF>
- *          the Java type of the referenced definition
- * @param <PARENT>
- *          the Java type of the parent container
- */
-public abstract class AbstractInstanceModelNamedReference<
-    BINDING,
-    DEF extends IBindingDefinitionModel,
-    PARENT extends IBindingContainerModelAbsolute>
-    extends AbstractInstanceModelNamed<BINDING, PARENT> {
-  @NonNull
-  private final DEF definition;
-
-  /**
-   * Construct a new bound named instance that references a global definition.
-   *
-   * @param binding
-   *          the instance object bound to a Java class
-   * @param bindingInstance
-   *          the Metaschema module instance for the bound object
-   * @param position
-   *          the zero-based position of this bound object relative to its bound
-   *          object siblings
-   * @param definition
-   *          the referenced global definition
-   * @param parent
-   *          the container containing this binding
-   * @param properties
-   *          the collection of properties associated with this instance, which
-   *          may be empty
-   * @param groupAs
-   *          the instance grouping information
-   */
-  protected AbstractInstanceModelNamedReference(
-      @NonNull BINDING binding,
-      @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
-      int position,
-      @NonNull DEF definition,
-      @NonNull PARENT parent,
-      @NonNull List<Property> properties,
-      @Nullable GroupAs groupAs) {
-    super(binding, bindingInstance, position, parent, properties, groupAs);
-    this.definition = definition;
-  }
-
-  @Override
-  public DEF getDefinition() {
-    return definition;
-  }
-
-  @Override
-  public String getName() {
-    return getDefinition().getName();
-  }
-
-  @Override
-  public String getJsonKeyFlagName() {
-    IBindingInstanceFlag instance = getDefinition().getJsonKeyFlagInstance();
-    return instance == null ? null : instance.getName();
-  }
-}
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AssemblyModelContainerSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AssemblyModelContainerSupport.java
index b611feca0..5dd8b9572 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AssemblyModelContainerSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/AssemblyModelContainerSupport.java
@@ -27,68 +27,72 @@
 package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
 
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
+import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
 import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceGroupBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.Choice;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.ChoiceGroup;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyReference;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldReference;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineField;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel.Choice;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel.ChoiceGroup;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyReference;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FieldReference;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.InlineDefineAssembly;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.InlineDefineField;
 
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 class AssemblyModelContainerSupport
     extends AbstractBindingModelContainerSupport
     implements IContainerModelAssemblySupport<
-        IBindingInstanceModelAbsolute,
-        IBindingInstanceModelNamedAbsolute,
-        IBindingInstanceModelFieldAbsolute,
-        IBindingInstanceModelAssemblyAbsolute,
-        IInstanceModelChoiceBinding,
-        IInstanceModelChoiceGroupBinding> {
+        IModelInstanceAbsolute,
+        INamedModelInstanceAbsolute,
+        IFieldInstanceAbsolute,
+        IAssemblyInstanceAbsolute,
+        IChoiceInstance,
+        IChoiceGroupInstance> {
   @NonNull
-  private final List<IBindingInstanceModelAbsolute> modelInstances;
+  private final List<IModelInstanceAbsolute> modelInstances;
   @NonNull
-  private final Map<String, IBindingInstanceModelNamedAbsolute> namedModelInstances;
+  private final Map<QName, INamedModelInstanceAbsolute> namedModelInstances;
   @NonNull
-  private final Map<String, IBindingInstanceModelFieldAbsolute> fieldInstances;
+  private final Map<QName, IFieldInstanceAbsolute> fieldInstances;
   @NonNull
-  private final Map<String, IBindingInstanceModelAssemblyAbsolute> assemblyInstances;
+  private final Map<QName, IAssemblyInstanceAbsolute> assemblyInstances;
   @NonNull
-  private final List<IInstanceModelChoiceBinding> choiceInstances;
+  private final List<IChoiceInstance> choiceInstances;
   @NonNull
-  private final Map<String, IInstanceModelChoiceGroupBinding> choiceGroupInstances;
+  private final Map<String, IChoiceGroupInstance> choiceGroupInstances;
 
   @SuppressWarnings("PMD.ShortMethodName")
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public static IContainerModelAssemblySupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute,
-      IInstanceModelChoiceBinding,
-      IInstanceModelChoiceGroupBinding> of(
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute,
+      IChoiceInstance,
+      IChoiceGroupInstance> of(
           @Nullable AssemblyModel binding,
           @NonNull IBoundInstanceModelAssembly bindingInstance,
-          @NonNull IBindingDefinitionAssembly parent,
+          @NonNull IAssemblyDefinition parent,
           @NonNull INodeItemFactory nodeItemFactory) {
     List<Object> instances;
     return binding == null || (instances = binding.getInstances()) == null || instances.isEmpty()
@@ -113,19 +117,20 @@ IInstanceModelChoiceGroupBinding> of(
    *          the node item factory used to generate child nodes
    */
   @SuppressWarnings({ "PMD.AvoidInstantiatingObjectsInLoops", "PMD.UseConcurrentHashMap", "PMD.PrematureDeclaration" })
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   protected AssemblyModelContainerSupport(
       @NonNull AssemblyModel model,
       @NonNull IBoundInstanceModelAssembly modelInstance,
-      @NonNull IBindingDefinitionAssembly parent,
+      @NonNull IAssemblyDefinition parent,
       @NonNull INodeItemFactory nodeItemFactory) {
 
     // create temporary collections to store the child binding objects
-    final List<IBindingInstanceModelAbsolute> modelInstances = new LinkedList<>();
-    final Map<String, IBindingInstanceModelNamedAbsolute> namedModelInstances = new LinkedHashMap<>();
-    final Map<String, IBindingInstanceModelFieldAbsolute> fieldInstances = new LinkedHashMap<>();
-    final Map<String, IBindingInstanceModelAssemblyAbsolute> assemblyInstances = new LinkedHashMap<>();
-    final List<IInstanceModelChoiceBinding> choiceInstances = new LinkedList<>();
-    final Map<String, IInstanceModelChoiceGroupBinding> choiceGroupInstances = new LinkedHashMap<>();
+    final List<IModelInstanceAbsolute> modelInstances = new LinkedList<>();
+    final Map<QName, INamedModelInstanceAbsolute> namedModelInstances = new LinkedHashMap<>();
+    final Map<QName, IFieldInstanceAbsolute> fieldInstances = new LinkedHashMap<>();
+    final Map<QName, IAssemblyInstanceAbsolute> assemblyInstances = new LinkedHashMap<>();
+    final List<IChoiceInstance> choiceInstances = new LinkedList<>();
+    final Map<String, IChoiceGroupInstance> choiceGroupInstances = new LinkedHashMap<>();
 
     // create counters to track child positions
     int assemblyReferencePosition = 0;
@@ -143,14 +148,14 @@ protected AssemblyModelContainerSupport(
           = (IBoundInstanceModelGroupedAssembly) instance.getItemInstance(obj);
 
       if (obj instanceof AssemblyReference) {
-        IBindingInstanceModelAssemblyAbsolute assembly = newInstance(
+        IAssemblyInstanceAbsolute assembly = newInstance(
             (AssemblyReference) obj,
             objInstance,
             assemblyReferencePosition++,
             parent);
         addInstance(assembly, modelInstances, namedModelInstances, assemblyInstances);
       } else if (obj instanceof InlineDefineAssembly) {
-        IBindingInstanceModelAssemblyAbsolute assembly = new InstanceModelAssemblyInline(
+        IAssemblyInstanceAbsolute assembly = new InstanceModelAssemblyInline(
             (InlineDefineAssembly) obj,
             objInstance,
             assemblyInlineDefinitionPosition++,
@@ -158,21 +163,21 @@ protected AssemblyModelContainerSupport(
             nodeItemFactory);
         addInstance(assembly, modelInstances, namedModelInstances, assemblyInstances);
       } else if (obj instanceof FieldReference) {
-        IBindingInstanceModelFieldAbsolute field = newInstance(
+        IFieldInstanceAbsolute field = newInstance(
             (FieldReference) obj,
             objInstance,
             fieldReferencePosition++,
             parent);
         addInstance(field, modelInstances, namedModelInstances, fieldInstances);
       } else if (obj instanceof InlineDefineField) {
-        IBindingInstanceModelFieldAbsolute field = new InstanceModelFieldInline(
+        IFieldInstanceAbsolute field = new InstanceModelFieldInline(
             (InlineDefineField) obj,
             objInstance,
             fieldInlineDefinitionPosition++,
             parent);
         addInstance(field, modelInstances, namedModelInstances, fieldInstances);
       } else if (obj instanceof AssemblyModel.Choice) {
-        IInstanceModelChoiceBinding choice = new InstanceModelChoice(
+        IChoiceInstance choice = new InstanceModelChoice(
             (Choice) obj,
             objInstance,
             choicePosition++,
@@ -181,7 +186,7 @@ protected AssemblyModelContainerSupport(
         modelInstances.add(choice);
         choiceInstances.add(choice);
       } else if (obj instanceof AssemblyModel.ChoiceGroup) {
-        IInstanceModelChoiceGroupBinding choiceGroup = new InstanceModelChoiceGroup(
+        IChoiceGroupInstance choiceGroup = new InstanceModelChoiceGroup(
             (ChoiceGroup) obj,
             objInstance,
             choiceGroupPosition++,
@@ -215,32 +220,32 @@ protected AssemblyModelContainerSupport(
   }
 
   @Override
-  public List<IBindingInstanceModelAbsolute> getModelInstances() {
+  public List<IModelInstanceAbsolute> getModelInstances() {
     return modelInstances;
   }
 
   @Override
-  public Map<String, IBindingInstanceModelNamedAbsolute> getNamedModelInstanceMap() {
+  public Map<QName, INamedModelInstanceAbsolute> getNamedModelInstanceMap() {
     return namedModelInstances;
   }
 
   @Override
-  public Map<String, IBindingInstanceModelFieldAbsolute> getFieldInstanceMap() {
+  public Map<QName, IFieldInstanceAbsolute> getFieldInstanceMap() {
     return fieldInstances;
   }
 
   @Override
-  public Map<String, IBindingInstanceModelAssemblyAbsolute> getAssemblyInstanceMap() {
+  public Map<QName, IAssemblyInstanceAbsolute> getAssemblyInstanceMap() {
     return assemblyInstances;
   }
 
   @Override
-  public List<IInstanceModelChoiceBinding> getChoiceInstances() {
+  public List<IChoiceInstance> getChoiceInstances() {
     return choiceInstances;
   }
 
   @Override
-  public Map<String, IInstanceModelChoiceGroupBinding> getChoiceGroupInstanceMap() {
+  public Map<String, IChoiceGroupInstance> getChoiceGroupInstanceMap() {
     return choiceGroupInstances;
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingModule.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingModule.java
index 354166766..df6713b85 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingModule.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/BindingModule.java
@@ -31,18 +31,17 @@
 import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
 import gov.nist.secauto.metaschema.core.model.AbstractModule;
-import gov.nist.secauto.metaschema.core.model.IDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
+import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelField;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.METASCHEMA;
 
 import java.net.URI;
 import java.util.Collection;
@@ -52,17 +51,20 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class BindingModule
     extends AbstractModule<
-        IBindingModule,
-        IBindingDefinitionModel,
-        IBindingDefinitionFlag,
-        IBindingDefinitionModelField,
-        IBindingDefinitionAssembly>
-    implements IBindingModule {
+        IMetaschemaModule,
+        IModelDefinition,
+        IFlagDefinition,
+        IFieldDefinition,
+        IAssemblyDefinition>
+    implements IMetaschemaModule {
   @NonNull
   private final URI location;
   @NonNull
@@ -70,15 +72,13 @@ public class BindingModule
   @NonNull
   private final Lazy<IDocumentNodeItem> nodeItem;
   @NonNull
-  private final Map<String, IDefinition> definitions;
-  @NonNull
-  private final Map<String, IBindingDefinitionFlag> flagDefinitions;
+  private final Map<QName, IFlagDefinition> flagDefinitions;
   @NonNull
-  private final Map<String, IBindingDefinitionModelField> fieldDefinitions;
+  private final Map<QName, IFieldDefinition> fieldDefinitions;
   @NonNull
-  private final Map<String, IBindingDefinitionAssembly> assemblyDefinitions;
+  private final Map<QName, IAssemblyDefinition> assemblyDefinitions;
   @NonNull
-  private final Map<String, IBindingDefinitionAssembly> rootAssemblyDefinitions;
+  private final Map<QName, IAssemblyDefinition> rootAssemblyDefinitions;
 
   /**
    * Constructs a new Metaschema instance.
@@ -95,15 +95,15 @@ public class BindingModule
    *           if a processing error occurs
    */
   @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public BindingModule( // NOPMD - unavoidable
       @NonNull URI resource,
       @NonNull IBoundDefinitionModelAssembly rootDefinition,
       @NonNull METASCHEMA binding,
-      @NonNull List<IBindingModule> importedModules) throws MetaschemaException {
+      @NonNull List<? extends IMetaschemaModule> importedModules) throws MetaschemaException {
     super(importedModules);
     this.location = ObjectUtils.requireNonNull(resource, "resource");
     this.binding = binding;
-    this.definitions = new LinkedHashMap<>();
     this.flagDefinitions = new LinkedHashMap<>();
     this.fieldDefinitions = new LinkedHashMap<>();
     this.assemblyDefinitions = new LinkedHashMap<>();
@@ -122,35 +122,32 @@ public BindingModule( // NOPMD - unavoidable
           = (IBoundInstanceModelGroupedAssembly) instance.getItemInstance(obj);
 
       if (obj instanceof METASCHEMA.DefineAssembly) {
-        IBindingDefinitionAssembly definition = new DefinitionAssemblyGlobal(
+        IAssemblyDefinition definition = new DefinitionAssemblyGlobal(
             (METASCHEMA.DefineAssembly) obj,
             objInstance,
             globalAssemblyPosition++,
             this,
             nodeItemFactory);
-        String name = definition.getName();
-        definitions.put(name, definition);
+        QName name = definition.getDefinitionQName();
         assemblyDefinitions.put(name, definition);
         if (definition.isRoot()) {
           rootAssemblyDefinitions.put(name, definition);
         }
       } else if (obj instanceof METASCHEMA.DefineField) {
-        IBindingDefinitionModelField definition = new DefinitionFieldGlobal(
+        IFieldDefinition definition = new DefinitionFieldGlobal(
             (METASCHEMA.DefineField) obj,
             objInstance,
             globalFieldPosition++,
             this);
-        String name = definition.getName();
-        definitions.put(name, definition);
+        QName name = definition.getDefinitionQName();
         fieldDefinitions.put(name, definition);
       } else if (obj instanceof METASCHEMA.DefineFlag) {
-        IBindingDefinitionFlag definition = new DefinitionFlagGlobal(
+        IFlagDefinition definition = new DefinitionFlagGlobal(
             (METASCHEMA.DefineFlag) obj,
             objInstance,
             globalFlagPosition++,
             this);
-        String name = definition.getName();
-        definitions.put(name, definition);
+        QName name = definition.getDefinitionQName();
         flagDefinitions.put(name, definition);
       } else {
         throw new IllegalStateException(
@@ -159,19 +156,17 @@ public BindingModule( // NOPMD - unavoidable
                 resource.toASCIIString()));
       }
     }
-    this.nodeItem = ObjectUtils.notNull(Lazy.lazy(() -> {
-      return nodeItemFactory.newDocumentNodeItem(rootDefinition, resource, binding);
-    }));
+    this.nodeItem
+        = ObjectUtils.notNull(Lazy.lazy(() -> nodeItemFactory.newDocumentNodeItem(rootDefinition, resource, binding)));
   }
 
-  @Override
   @NonNull
   public METASCHEMA getBinding() {
     return binding;
   }
 
   @Override
-  public IDocumentNodeItem getBoundNodeItem() {
+  public IDocumentNodeItem getNodeItem() {
     return ObjectUtils.notNull(nodeItem.get());
   }
 
@@ -232,69 +227,64 @@ public URI getJsonBaseUri() {
     return retval;
   }
 
-  @NonNull
-  public Collection<IDefinition> getDefinitions() {
-    return ObjectUtils.notNull(definitions.values());
-  }
-
-  private Map<String, IBindingDefinitionAssembly> getAssemblyDefinitionMap() {
+  private Map<QName, IAssemblyDefinition> getAssemblyDefinitionMap() {
     return assemblyDefinitions;
   }
 
   @Override
-  public Collection<IBindingDefinitionAssembly> getAssemblyDefinitions() {
+  public Collection<IAssemblyDefinition> getAssemblyDefinitions() {
     return ObjectUtils.notNull(getAssemblyDefinitionMap().values());
   }
 
   @Override
-  public IBindingDefinitionAssembly getAssemblyDefinitionByName(@NonNull String name) {
+  public IAssemblyDefinition getAssemblyDefinitionByName(@NonNull QName name) {
     return getAssemblyDefinitionMap().get(name);
   }
 
-  private Map<String, IBindingDefinitionModelField> getFieldDefinitionMap() {
+  private Map<QName, IFieldDefinition> getFieldDefinitionMap() {
     return fieldDefinitions;
   }
 
   @SuppressWarnings("null")
   @Override
-  public Collection<IBindingDefinitionModelField> getFieldDefinitions() {
+  public Collection<IFieldDefinition> getFieldDefinitions() {
     return getFieldDefinitionMap().values();
   }
 
   @Override
-  public IBindingDefinitionModelField getFieldDefinitionByName(@NonNull String name) {
+  public IFieldDefinition getFieldDefinitionByName(@NonNull QName name) {
     return getFieldDefinitionMap().get(name);
   }
 
   @SuppressWarnings("null")
   @Override
-  public List<IBindingDefinitionModel> getAssemblyAndFieldDefinitions() {
+  public List<IModelDefinition> getAssemblyAndFieldDefinitions() {
     return Stream.concat(getAssemblyDefinitions().stream(), getFieldDefinitions().stream())
         .collect(Collectors.toList());
   }
 
-  private Map<String, IBindingDefinitionFlag> getFlagDefinitionMap() {
+  private Map<QName, IFlagDefinition> getFlagDefinitionMap() {
     return flagDefinitions;
   }
 
   @SuppressWarnings("null")
   @Override
-  public Collection<IBindingDefinitionFlag> getFlagDefinitions() {
+  public Collection<IFlagDefinition> getFlagDefinitions() {
     return getFlagDefinitionMap().values();
   }
 
   @Override
-  public IBindingDefinitionFlag getFlagDefinitionByName(@NonNull String name) {
+  public IFlagDefinition getFlagDefinitionByName(@NonNull QName name) {
     return getFlagDefinitionMap().get(name);
   }
 
-  private Map<String, ? extends IBindingDefinitionAssembly> getRootAssemblyDefinitionMap() {
+  private Map<QName, ? extends IAssemblyDefinition> getRootAssemblyDefinitionMap() {
     return rootAssemblyDefinitions;
   }
 
   @SuppressWarnings("null")
   @Override
-  public Collection<? extends IBindingDefinitionAssembly> getRootAssemblyDefinitions() {
+  public Collection<? extends IAssemblyDefinition> getRootAssemblyDefinitions() {
     return getRootAssemblyDefinitionMap().values();
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceGroupModelContainerSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceGroupModelContainerSupport.java
index 623350755..7790ac1f4 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceGroupModelContainerSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceGroupModelContainerSupport.java
@@ -27,50 +27,53 @@
 package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
 
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped;
+import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
 import gov.nist.secauto.metaschema.core.model.IContainerModelSupport;
+import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped;
+import gov.nist.secauto.metaschema.core.model.IModule;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelField;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyGrouped;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldGrouped;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedGrouped;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceGroupBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 class ChoiceGroupModelContainerSupport
     implements IContainerModelSupport<
-        IBindingInstanceModelNamedGrouped,
-        IBindingInstanceModelNamedGrouped,
-        IBindingInstanceModelFieldGrouped,
-        IBindingInstanceModelAssemblyGrouped> {
+        INamedModelInstanceGrouped,
+        INamedModelInstanceGrouped,
+        IFieldInstanceGrouped,
+        IAssemblyInstanceGrouped> {
   @NonNull
-  private final Map<String, IBindingInstanceModelNamedGrouped> namedModelInstances;
+  private final Map<QName, INamedModelInstanceGrouped> namedModelInstances;
   @NonNull
-  private final Map<String, IBindingInstanceModelFieldGrouped> fieldInstances;
+  private final Map<QName, IFieldInstanceGrouped> fieldInstances;
   @NonNull
-  private final Map<String, IBindingInstanceModelAssemblyGrouped> assemblyInstances;
+  private final Map<QName, IAssemblyInstanceGrouped> assemblyInstances;
 
   @SuppressWarnings("PMD.ShortMethodName")
   public static IContainerModelSupport<
-      IBindingInstanceModelNamedGrouped,
-      IBindingInstanceModelNamedGrouped,
-      IBindingInstanceModelFieldGrouped,
-      IBindingInstanceModelAssemblyGrouped> of(
+      INamedModelInstanceGrouped,
+      INamedModelInstanceGrouped,
+      IFieldInstanceGrouped,
+      IAssemblyInstanceGrouped> of(
           @Nullable AssemblyModel.ChoiceGroup binding,
           @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
-          @NonNull IInstanceModelChoiceGroupBinding parent,
+          @NonNull IChoiceGroupInstance parent,
           @NonNull INodeItemFactory nodeItemFactory) {
     List<Object> instances;
     return binding == null || (instances = binding.getChoices()) == null || instances.isEmpty()
@@ -95,16 +98,17 @@ IBindingInstanceModelAssemblyGrouped> of(
    *          the node item factory used to generate child nodes
    */
   @SuppressWarnings({ "PMD.AvoidInstantiatingObjectsInLoops", "PMD.UseConcurrentHashMap", "PMD.PrematureDeclaration" })
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public ChoiceGroupModelContainerSupport(
       @NonNull AssemblyModel.ChoiceGroup binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
-      @NonNull IInstanceModelChoiceGroupBinding parent,
+      @NonNull IChoiceGroupInstance parent,
       @NonNull INodeItemFactory nodeItemFactory) {
 
     // create temporary collections to store the child binding objects
-    final Map<String, IBindingInstanceModelNamedGrouped> namedModelInstances = new LinkedHashMap<>();
-    final Map<String, IBindingInstanceModelFieldGrouped> fieldInstances = new LinkedHashMap<>();
-    final Map<String, IBindingInstanceModelAssemblyGrouped> assemblyInstances = new LinkedHashMap<>();
+    final Map<QName, INamedModelInstanceGrouped> namedModelInstances = new LinkedHashMap<>();
+    final Map<QName, IFieldInstanceGrouped> fieldInstances = new LinkedHashMap<>();
+    final Map<QName, IAssemblyInstanceGrouped> assemblyInstances = new LinkedHashMap<>();
 
     // create counters to track child positions
     int assemblyReferencePosition = 0;
@@ -120,14 +124,14 @@ public ChoiceGroupModelContainerSupport(
           = (IBoundInstanceModelGroupedAssembly) instance.getItemInstance(obj);
 
       if (obj instanceof AssemblyModel.ChoiceGroup.Assembly) {
-        IBindingInstanceModelAssemblyGrouped assembly = newInstance(
+        IAssemblyInstanceGrouped assembly = newInstance(
             (AssemblyModel.ChoiceGroup.Assembly) obj,
             objInstance,
             assemblyReferencePosition++,
             parent);
         addInstance(assembly, namedModelInstances, assemblyInstances);
       } else if (obj instanceof AssemblyModel.ChoiceGroup.DefineAssembly) {
-        IBindingInstanceModelAssemblyGrouped assembly = new InstanceModelGroupedAssemblyInline(
+        IAssemblyInstanceGrouped assembly = new InstanceModelGroupedAssemblyInline(
             (AssemblyModel.ChoiceGroup.DefineAssembly) obj,
             objInstance,
             assemblyInlineDefinitionPosition++,
@@ -135,14 +139,14 @@ public ChoiceGroupModelContainerSupport(
             nodeItemFactory);
         addInstance(assembly, namedModelInstances, assemblyInstances);
       } else if (obj instanceof AssemblyModel.ChoiceGroup.Field) {
-        IBindingInstanceModelFieldGrouped field = newInstance(
+        IFieldInstanceGrouped field = newInstance(
             (AssemblyModel.ChoiceGroup.Field) obj,
             objInstance,
             fieldReferencePosition++,
             parent);
         addInstance(field, namedModelInstances, fieldInstances);
       } else if (obj instanceof AssemblyModel.ChoiceGroup.DefineField) {
-        IBindingInstanceModelFieldGrouped field = new InstanceModelGroupedFieldInline(
+        IFieldInstanceGrouped field = new InstanceModelGroupedFieldInline(
             (AssemblyModel.ChoiceGroup.DefineField) obj,
             objInstance,
             fieldInlineDefinitionPosition++,
@@ -166,34 +170,34 @@ public ChoiceGroupModelContainerSupport(
   }
 
   protected static void addInstance(
-      @NonNull IBindingInstanceModelAssemblyGrouped assembly,
-      @NonNull Map<String, IBindingInstanceModelNamedGrouped> namedModelInstances,
-      @NonNull Map<String, IBindingInstanceModelAssemblyGrouped> assemblyInstances) {
-    String effectiveName = assembly.getEffectiveName();
+      @NonNull IAssemblyInstanceGrouped assembly,
+      @NonNull Map<QName, INamedModelInstanceGrouped> namedModelInstances,
+      @NonNull Map<QName, IAssemblyInstanceGrouped> assemblyInstances) {
+    QName effectiveName = assembly.getXmlQName();
     namedModelInstances.put(effectiveName, assembly);
     assemblyInstances.put(effectiveName, assembly);
   }
 
   protected static void addInstance(
-      @NonNull IBindingInstanceModelFieldGrouped field,
-      @NonNull Map<String, IBindingInstanceModelNamedGrouped> namedModelInstances,
-      @NonNull Map<String, IBindingInstanceModelFieldGrouped> fieldInstances) {
-    String effectiveName = field.getEffectiveName();
+      @NonNull IFieldInstanceGrouped field,
+      @NonNull Map<QName, INamedModelInstanceGrouped> namedModelInstances,
+      @NonNull Map<QName, IFieldInstanceGrouped> fieldInstances) {
+    QName effectiveName = field.getXmlQName();
     namedModelInstances.put(effectiveName, field);
     fieldInstances.put(effectiveName, field);
   }
 
   @NonNull
-  protected static IBindingInstanceModelAssemblyGrouped newInstance(
+  protected static IAssemblyInstanceGrouped newInstance(
       @NonNull AssemblyModel.ChoiceGroup.Assembly obj,
       @NonNull IBoundInstanceModelGroupedAssembly objInstance,
       int position,
-      @NonNull IInstanceModelChoiceGroupBinding parent) {
-    IBindingDefinitionAssembly owningDefinition = parent.getOwningDefinition();
-    IBindingModule module = owningDefinition.getContainingModule();
+      @NonNull IChoiceGroupInstance parent) {
+    IAssemblyDefinition owningDefinition = parent.getOwningDefinition();
+    IModule module = owningDefinition.getContainingModule();
 
-    String name = ObjectUtils.requireNonNull(obj.getRef());
-    IBindingDefinitionAssembly definition = module.getScopedAssemblyDefinitionByName(name);
+    QName name = parent.getContainingModule().toModelQName(ObjectUtils.requireNonNull(obj.getRef()));
+    IAssemblyDefinition definition = module.getScopedAssemblyDefinitionByName(name);
 
     if (definition == null) {
       throw new IllegalStateException(
@@ -206,16 +210,16 @@ protected static IBindingInstanceModelAssemblyGrouped newInstance(
   }
 
   @NonNull
-  protected static IBindingInstanceModelFieldGrouped newInstance(
+  protected static IFieldInstanceGrouped newInstance(
       @NonNull AssemblyModel.ChoiceGroup.Field obj,
       @NonNull IBoundInstanceModelGroupedAssembly objInstance,
       int position,
-      @NonNull IInstanceModelChoiceGroupBinding parent) {
-    IBindingDefinitionAssembly owningDefinition = parent.getOwningDefinition();
-    IBindingModule module = owningDefinition.getContainingModule();
+      @NonNull IChoiceGroupInstance parent) {
+    IAssemblyDefinition owningDefinition = parent.getOwningDefinition();
+    IModule module = owningDefinition.getContainingModule();
 
-    String name = ObjectUtils.requireNonNull(obj.getRef());
-    IBindingDefinitionModelField definition = module.getScopedFieldDefinitionByName(name);
+    QName name = parent.getContainingModule().toModelQName(ObjectUtils.requireNonNull(obj.getRef()));
+    IFieldDefinition definition = module.getScopedFieldDefinitionByName(name);
     if (definition == null) {
       throw new IllegalStateException(
           String.format("Unable to resolve field reference '%s' in definition '%s' in module '%s'",
@@ -228,22 +232,22 @@ protected static IBindingInstanceModelFieldGrouped newInstance(
 
   @SuppressWarnings("null")
   @Override
-  public Collection<IBindingInstanceModelNamedGrouped> getModelInstances() {
+  public Collection<INamedModelInstanceGrouped> getModelInstances() {
     return namedModelInstances.values();
   }
 
   @Override
-  public Map<String, IBindingInstanceModelNamedGrouped> getNamedModelInstanceMap() {
+  public Map<QName, INamedModelInstanceGrouped> getNamedModelInstanceMap() {
     return namedModelInstances;
   }
 
   @Override
-  public Map<String, IBindingInstanceModelFieldGrouped> getFieldInstanceMap() {
+  public Map<QName, IFieldInstanceGrouped> getFieldInstanceMap() {
     return fieldInstances;
   }
 
   @Override
-  public Map<String, IBindingInstanceModelAssemblyGrouped> getAssemblyInstanceMap() {
+  public Map<QName, IAssemblyInstanceGrouped> getAssemblyInstanceMap() {
     return assemblyInstances;
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceModelContainerSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceModelContainerSupport.java
index d7b817859..85e79e37e 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceModelContainerSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ChoiceModelContainerSupport.java
@@ -27,50 +27,53 @@
 package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
 
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
 import gov.nist.secauto.metaschema.core.model.IContainerModelSupport;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.Choice;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyReference;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldReference;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineField;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel.Choice;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyReference;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FieldReference;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.InlineDefineAssembly;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.InlineDefineField;
 
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 class ChoiceModelContainerSupport
     extends AbstractBindingModelContainerSupport {
   @NonNull
-  private final List<IBindingInstanceModelAbsolute> modelInstances;
+  private final List<IModelInstanceAbsolute> modelInstances;
   @NonNull
-  private final Map<String, IBindingInstanceModelNamedAbsolute> namedModelInstances;
+  private final Map<QName, INamedModelInstanceAbsolute> namedModelInstances;
   @NonNull
-  private final Map<String, IBindingInstanceModelFieldAbsolute> fieldInstances;
+  private final Map<QName, IFieldInstanceAbsolute> fieldInstances;
   @NonNull
-  private final Map<String, IBindingInstanceModelAssemblyAbsolute> assemblyInstances;
+  private final Map<QName, IAssemblyInstanceAbsolute> assemblyInstances;
 
   @SuppressWarnings("PMD.ShortMethodName")
   public static IContainerModelSupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute> of(
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute> of(
           @Nullable Choice binding,
           @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
-          @NonNull IInstanceModelChoiceBinding parent,
+          @NonNull IChoiceInstance parent,
           @NonNull INodeItemFactory nodeItemFactory) {
     List<Object> instances;
     return binding == null || (instances = binding.getChoices()) == null || instances.isEmpty()
@@ -95,17 +98,18 @@ IBindingInstanceModelAssemblyAbsolute> of(
    *          the node item factory used to generate child nodes
    */
   @SuppressWarnings({ "PMD.AvoidInstantiatingObjectsInLoops", "PMD.UseConcurrentHashMap", "PMD.PrematureDeclaration" })
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public ChoiceModelContainerSupport(
       @NonNull Choice binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
-      @NonNull IInstanceModelChoiceBinding parent,
+      @NonNull IChoiceInstance parent,
       @NonNull INodeItemFactory nodeItemFactory) {
 
     // create temporary collections to store the child binding objects
-    final List<IBindingInstanceModelAbsolute> modelInstances = new LinkedList<>();
-    final Map<String, IBindingInstanceModelNamedAbsolute> namedModelInstances = new LinkedHashMap<>();
-    final Map<String, IBindingInstanceModelFieldAbsolute> fieldInstances = new LinkedHashMap<>();
-    final Map<String, IBindingInstanceModelAssemblyAbsolute> assemblyInstances = new LinkedHashMap<>();
+    final List<IModelInstanceAbsolute> modelInstances = new LinkedList<>();
+    final Map<QName, INamedModelInstanceAbsolute> namedModelInstances = new LinkedHashMap<>();
+    final Map<QName, IFieldInstanceAbsolute> fieldInstances = new LinkedHashMap<>();
+    final Map<QName, IAssemblyInstanceAbsolute> assemblyInstances = new LinkedHashMap<>();
 
     // create counters to track child positions
     int assemblyReferencePosition = 0;
@@ -121,14 +125,14 @@ public ChoiceModelContainerSupport(
           = (IBoundInstanceModelGroupedAssembly) instance.getItemInstance(obj);
 
       if (obj instanceof AssemblyReference) {
-        IBindingInstanceModelAssemblyAbsolute assembly = newInstance(
+        IAssemblyInstanceAbsolute assembly = newInstance(
             (AssemblyReference) obj,
             objInstance,
             assemblyReferencePosition++,
             parent);
         addInstance(assembly, modelInstances, namedModelInstances, assemblyInstances);
       } else if (obj instanceof InlineDefineAssembly) {
-        IBindingInstanceModelAssemblyAbsolute assembly = new InstanceModelAssemblyInline(
+        IAssemblyInstanceAbsolute assembly = new InstanceModelAssemblyInline(
             (InlineDefineAssembly) obj,
             objInstance,
             assemblyInlineDefinitionPosition++,
@@ -136,14 +140,14 @@ public ChoiceModelContainerSupport(
             nodeItemFactory);
         addInstance(assembly, modelInstances, namedModelInstances, assemblyInstances);
       } else if (obj instanceof FieldReference) {
-        IBindingInstanceModelFieldAbsolute field = newInstance(
+        IFieldInstanceAbsolute field = newInstance(
             (FieldReference) obj,
             objInstance,
             fieldReferencePosition++,
             parent);
         addInstance(field, modelInstances, namedModelInstances, fieldInstances);
       } else if (obj instanceof InlineDefineField) {
-        IBindingInstanceModelFieldAbsolute field = new InstanceModelFieldInline(
+        IFieldInstanceAbsolute field = new InstanceModelFieldInline(
             (InlineDefineField) obj,
             objInstance,
             fieldInlineDefinitionPosition++,
@@ -169,22 +173,22 @@ public ChoiceModelContainerSupport(
   }
 
   @Override
-  public List<IBindingInstanceModelAbsolute> getModelInstances() {
+  public List<IModelInstanceAbsolute> getModelInstances() {
     return modelInstances;
   }
 
   @Override
-  public Map<String, IBindingInstanceModelNamedAbsolute> getNamedModelInstanceMap() {
+  public Map<QName, INamedModelInstanceAbsolute> getNamedModelInstanceMap() {
     return namedModelInstances;
   }
 
   @Override
-  public Map<String, IBindingInstanceModelFieldAbsolute> getFieldInstanceMap() {
+  public Map<QName, IFieldInstanceAbsolute> getFieldInstanceMap() {
     return fieldInstances;
   }
 
   @Override
-  public Map<String, IBindingInstanceModelAssemblyAbsolute> getAssemblyInstanceMap() {
+  public Map<QName, IAssemblyInstanceAbsolute> getAssemblyInstanceMap() {
     return assemblyInstances;
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java
index 63e10c9f4..6334caaa6 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java
@@ -28,7 +28,6 @@
 
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
-import gov.nist.secauto.metaschema.core.metapath.MetapathExpression;
 import gov.nist.secauto.metaschema.core.model.constraint.AbstractConstraintBuilder;
 import gov.nist.secauto.metaschema.core.model.constraint.AbstractKeyConstraintBuilder;
 import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint;
@@ -45,30 +44,33 @@
 import gov.nist.secauto.metaschema.core.model.constraint.IUniqueConstraint;
 import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.ConstraintLetExpression;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.ConstraintValueEnum;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FlagAllowedValues;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FlagExpect;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FlagIndexHasKey;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FlagMatches;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.KeyConstraintField;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.Property;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.Remarks;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.TargetedAllowedValuesConstraint;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.TargetedExpectConstraint;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.TargetedHasCardinalityConstraint;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.TargetedIndexConstraint;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.TargetedIndexHasKeyConstraint;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.TargetedIsUniqueConstraint;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.TargetedMatchesConstraint;
 import gov.nist.secauto.metaschema.databind.model.metaschema.IConstraintBase;
 import gov.nist.secauto.metaschema.databind.model.metaschema.IModelConstraintsBase;
 import gov.nist.secauto.metaschema.databind.model.metaschema.IValueConstraintsBase;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.ConstraintLetExpression;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.ConstraintValueEnum;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagAllowedValues;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagExpect;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagIndexHasKey;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagMatches;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.KeyConstraintField;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Remarks;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedAllowedValuesConstraint;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedExpectConstraint;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedHasCardinalityConstraint;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIndexConstraint;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIndexHasKeyConstraint;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedIsUniqueConstraint;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.TargetedMatchesConstraint;
+import gov.nist.secauto.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase;
 
 import java.math.BigInteger;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -101,16 +103,27 @@ public static void parse(
     }
   }
 
-  public static void parseLet(
+  public static void parse(
       @NonNull IValueConstrained constraintSet,
-      @NonNull IValueConstraintsBase constraints,
+      @NonNull IValueTargetedConstraintsBase constraints,
       @NonNull ISource source) {
-    // parse let expressions
-    for (ConstraintLetExpression letObj : constraints.getLets()) {
-      ILet let = ILet.of(
-          ObjectUtils.requireNonNull(letObj.getVar()),
-          ObjectUtils.requireNonNull(letObj.getExpression()), source);
-      constraintSet.addLetExpression(let);
+    parseLet(constraintSet, constraints, source);
+
+    // parse rules
+    for (IConstraintBase ruleObj : constraints.getRules()) {
+      if (ruleObj instanceof TargetedAllowedValuesConstraint) {
+        IAllowedValuesConstraint constraint = newAllowedValues((TargetedAllowedValuesConstraint) ruleObj, source);
+        constraintSet.addConstraint(constraint);
+      } else if (ruleObj instanceof TargetedExpectConstraint) {
+        IExpectConstraint constraint = newExpect((TargetedExpectConstraint) ruleObj, source);
+        constraintSet.addConstraint(constraint);
+      } else if (ruleObj instanceof TargetedIndexHasKeyConstraint) {
+        IIndexHasKeyConstraint constraint = newIndexHasKey((TargetedIndexHasKeyConstraint) ruleObj, source);
+        constraintSet.addConstraint(constraint);
+      } else if (ruleObj instanceof TargetedMatchesConstraint) {
+        IMatchesConstraint constraint = newMatches((TargetedMatchesConstraint) ruleObj, source);
+        constraintSet.addConstraint(constraint);
+      }
     }
   }
 
@@ -147,12 +160,25 @@ public static void parse(
     }
   }
 
+  public static void parseLet(
+      @NonNull IValueConstrained constraintSet,
+      @NonNull IValueConstraintsBase constraints,
+      @NonNull ISource source) {
+    // parse let expressions
+    for (ConstraintLetExpression letObj : constraints.getLets()) {
+      ILet let = ILet.of(
+          ObjectUtils.requireNonNull(new QName(letObj.getVar())),
+          ObjectUtils.requireNonNull(letObj.getExpression()), source);
+      constraintSet.addLetExpression(let);
+    }
+  }
+
   @NonNull
   private static IAllowedValuesConstraint newAllowedValues(
       @NonNull FlagAllowedValues obj,
       @NonNull ISource source) {
     IAllowedValuesConstraint.Builder builder = IAllowedValuesConstraint.builder()
-        .allowedOther(ModelSupport.yesOrNo(obj.getAllowOther()))
+        .allowsOther(ModelSupport.yesOrNo(obj.getAllowOther()))
         .extensible(extensible(obj.getExtensible()));
     applyCommonValues(obj, null, source, builder);
 
@@ -167,7 +193,7 @@ private static IAllowedValuesConstraint newAllowedValues(
       @NonNull TargetedAllowedValuesConstraint obj,
       @NonNull ISource source) {
     IAllowedValuesConstraint.Builder builder = IAllowedValuesConstraint.builder()
-        .allowedOther(ModelSupport.yesOrNo(obj.getAllowOther()))
+        .allowsOther(ModelSupport.yesOrNo(obj.getAllowOther()))
         .extensible(extensible(ObjectUtils.requireNonNull(obj.getExtensible())));
     applyCommonValues(obj, obj.getTarget(), source, builder);
 
@@ -229,8 +255,7 @@ private static IExpectConstraint newExpect(
   private static IIndexHasKeyConstraint newIndexHasKey(
       @NonNull FlagIndexHasKey obj,
       @NonNull ISource source) {
-    IIndexHasKeyConstraint.Builder builder = IIndexHasKeyConstraint.builder()
-        .name(ObjectUtils.requireNonNull(obj.getName()));
+    IIndexHasKeyConstraint.Builder builder = IIndexHasKeyConstraint.builder(ObjectUtils.requireNonNull(obj.getName()));
     applyCommonValues(obj, null, source, builder);
     handleKeyConstraints(ObjectUtils.requireNonNull(obj.getKeyFields()), builder);
     return builder.build();
@@ -240,8 +265,7 @@ private static IIndexHasKeyConstraint newIndexHasKey(
   private static IIndexHasKeyConstraint newIndexHasKey(
       @NonNull TargetedIndexHasKeyConstraint obj,
       @NonNull ISource source) {
-    IIndexHasKeyConstraint.Builder builder = IIndexHasKeyConstraint.builder()
-        .name(ObjectUtils.requireNonNull(obj.getName()));
+    IIndexHasKeyConstraint.Builder builder = IIndexHasKeyConstraint.builder(ObjectUtils.requireNonNull(obj.getName()));
     applyCommonValues(obj, obj.getTarget(), source, builder);
     handleKeyConstraints(ObjectUtils.requireNonNull(obj.getKeyFields()), builder);
     return builder.build();
@@ -293,8 +317,7 @@ private static IMatchesConstraint newMatches(
   private static IIndexConstraint newIndex(
       @NonNull TargetedIndexConstraint obj,
       @NonNull ISource source) {
-    IIndexConstraint.Builder builder = IIndexConstraint.builder()
-        .name(ObjectUtils.requireNonNull(obj.getName()));
+    IIndexConstraint.Builder builder = IIndexConstraint.builder(ObjectUtils.requireNonNull(obj.getName()));
     applyCommonValues(obj, obj.getTarget(), source, builder);
     handleKeyConstraints(ObjectUtils.requireNonNull(obj.getKeyFields()), builder);
 
@@ -370,10 +393,10 @@ private static IUniqueConstraint newUnique(
   }
 
   @NonNull
-  private static MetapathExpression target(@Nullable String target) {
+  private static String target(@Nullable String target) {
     return target == null
-        ? MetapathExpression.CONTEXT_NODE
-        : MetapathExpression.compile(target);
+        ? IConstraint.DEFAULT_TARGET_METAPATH
+        : target;
   }
 
   @NonNull
@@ -393,6 +416,9 @@ private static IConstraint.Level level(@Nullable String level) {
       case "INFORMATIONAL":
         retval = IConstraint.Level.INFORMATIONAL;
         break;
+      case "DEBUG":
+        retval = IConstraint.Level.DEBUG;
+        break;
       default:
         throw new UnsupportedOperationException(level);
       }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java
index 235a1b6aa..5af790274 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java
@@ -29,29 +29,29 @@
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
+import gov.nist.secauto.metaschema.core.model.AbstractGlobalAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstance;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
+import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
+import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
 import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
 import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IFlagInstance;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
+import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.ModuleScopeEnum;
 import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet;
 import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceGroupBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyConstraints;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyConstraints;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.JsonKey;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.METASCHEMA;
 
 import java.util.Map;
 import java.util.Set;
@@ -60,22 +60,30 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class DefinitionAssemblyGlobal
-    extends AbstractDefinition<METASCHEMA.DefineAssembly>
-    implements IBindingDefinitionAssembly,
-    IFeatureBindingContainerFlag,
-    IFeatureBindingContainerModelAssembly {
+    extends AbstractGlobalAssemblyDefinition<
+        IMetaschemaModule,
+        IAssemblyInstance,
+        IFlagInstance,
+        IModelInstanceAbsolute,
+        INamedModelInstanceAbsolute,
+        IFieldInstanceAbsolute,
+        IAssemblyInstanceAbsolute,
+        IChoiceInstance,
+        IChoiceGroupInstance> {
+  @NonNull
+  private final METASCHEMA.DefineAssembly binding;
   @NonNull
   private final Map<IAttributable.Key, Set<String>> properties;
   @NonNull
-  private final Lazy<IContainerFlagSupport<IBindingInstanceFlag>> flagContainer;
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IContainerModelAssemblySupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute,
-      IInstanceModelChoiceBinding,
-      IInstanceModelChoiceGroupBinding>> modelContainer;
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute,
+      IChoiceInstance,
+      IChoiceGroupInstance>> modelContainer;
   @NonNull
   private final Lazy<IModelConstrained> modelConstraints;
   @NonNull
@@ -101,22 +109,25 @@ public DefinitionAssemblyGlobal(
       @NonNull METASCHEMA.DefineAssembly binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingModule module,
+      @NonNull IMetaschemaModule module,
       @NonNull INodeItemFactory nodeItemFactory) {
-    super(binding, module);
+    super(module);
+    this.binding = binding;
     this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> FlagContainerSupport.of(
-        binding.getFlags(),
-        bindingInstance,
-        this)));
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> {
+      JsonKey jsonKey = getBinding().getJsonKey();
+      return FlagContainerSupport.newFlagContainer(
+          binding.getFlags(),
+          bindingInstance,
+          this,
+          jsonKey == null ? null : jsonKey.getFlagRef());
+    }));
     this.modelContainer = ObjectUtils.notNull(Lazy.lazy(() -> AssemblyModelContainerSupport.of(
         binding.getModel(),
-        ObjectUtils.requireNonNull(bindingInstance.getDefinition().getAssemblyInstanceByName("model")),
+        ObjectUtils.requireNonNull(bindingInstance.getDefinition().getAssemblyInstanceByName(MODEL_QNAME)),
         this,
         nodeItemFactory)));
-    this.modelConstraints = ObjectUtils.notNull(Lazy.lazy(() ->
-
-    {
+    this.modelConstraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IModelConstrained retval = new AssemblyConstraintSet();
       AssemblyConstraints constraints = getBinding().getConstraint();
       if (constraints != null) {
@@ -124,26 +135,30 @@ public DefinitionAssemblyGlobal(
       }
       return retval;
     }));
-    this.boundNodeItem = ObjectUtils.notNull(Lazy.lazy(() -> (IAssemblyNodeItem)
+    this.boundNodeItem = ObjectUtils.notNull(Lazy.lazy(() -> ObjectUtils.requireNonNull(ModelSupport.toNodeItem(
+        module,
+        bindingInstance.getXmlQName(),
+        position))));
+  }
 
-    getContainingModule().getBoundNodeItem()
-        .getModelItemsByName(bindingInstance.getEffectiveName())
-        .get(position)));
+  @NonNull
+  protected METASCHEMA.DefineAssembly getBinding() {
+    return binding;
   }
 
   @Override
-  public IContainerFlagSupport<IBindingInstanceFlag> getFlagContainer() {
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
     return ObjectUtils.notNull(flagContainer.get());
   }
 
   @Override
   public IContainerModelAssemblySupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute,
-      IInstanceModelChoiceBinding,
-      IInstanceModelChoiceGroupBinding> getModelContainer() {
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute,
+      IChoiceInstance,
+      IChoiceGroupInstance> getModelContainer() {
     return ObjectUtils.notNull(modelContainer.get());
   }
 
@@ -152,9 +167,8 @@ public IModelConstrained getConstraintSupport() {
     return ObjectUtils.notNull(modelConstraints.get());
   }
 
-  @SuppressWarnings("null")
   @Override
-  public INodeItem getBoundNodeItem() {
+  public IAssemblyNodeItem getNodeItem() {
     return boundNodeItem.get();
   }
 
@@ -163,6 +177,10 @@ public Map<IAttributable.Key, Set<String>> getProperties() {
     return properties;
   }
 
+  // ---------------------------------------
+  // - Start binding driven code - CPD-OFF -
+  // ---------------------------------------
+
   @Override
   public String getFormalName() {
     return getBinding().getFormalName();
@@ -203,12 +221,6 @@ public MarkupMultiline getRemarks() {
     return ModelSupport.remarks(getBinding().getRemarks());
   }
 
-  @Override
-  public String getJsonKeyFlagName() {
-    JsonKey jsonKey = getBinding().getJsonKey();
-    return jsonKey == null ? null : jsonKey.getFlagRef();
-  }
-
   @Override
   public boolean isRoot() {
     return getRootName() != null || getRootIndex() != null;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java
index eef7c4295..2fcd4ff3b 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java
@@ -30,23 +30,22 @@
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.model.AbstractGlobalFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
+import gov.nist.secauto.metaschema.core.model.IFieldInstance;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.ModuleScopeEnum;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelField;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldConstraints;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FieldConstraints;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.JsonKey;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.JsonValueKeyFlag;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.METASCHEMA;
 
 import java.util.Map;
 import java.util.Set;
@@ -56,9 +55,9 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class DefinitionFieldGlobal
-    extends AbstractDefinition<METASCHEMA.DefineField>
-    implements IBindingDefinitionModelField,
-    IFeatureBindingContainerFlag {
+    extends AbstractGlobalFieldDefinition<IMetaschemaModule, IFieldInstance, IFlagInstance> {
+  @NonNull
+  private final METASCHEMA.DefineField binding;
   @NonNull
   private final Map<IAttributable.Key, Set<String>> properties;
   @NonNull
@@ -66,7 +65,7 @@ public class DefinitionFieldGlobal
   @Nullable
   private final Object defaultValue;
   @NonNull
-  private final Lazy<IContainerFlagSupport<IBindingInstanceFlag>> flagContainer;
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IValueConstrained> valueConstraints;
   @NonNull
@@ -76,31 +75,41 @@ public DefinitionFieldGlobal(
       @NonNull METASCHEMA.DefineField binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingModule module) {
-    super(binding, module);
-    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(getBinding().getProps()));
-    this.javaTypeAdapter = ModelSupport.dataType(getBinding().getAsType());
-    this.defaultValue = ModelSupport.defaultValue(getBinding().getDefault(), this.javaTypeAdapter);
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> FlagContainerSupport.of(
-        binding.getFlags(),
-        bindingInstance,
-        this)));
+      @NonNull IMetaschemaModule module) {
+    super(module);
+    this.binding = binding;
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.javaTypeAdapter = ModelSupport.dataType(binding.getAsType());
+    this.defaultValue = ModelSupport.defaultValue(binding.getDefault(), this.javaTypeAdapter);
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> {
+      JsonKey jsonKey = binding.getJsonKey();
+      return FlagContainerSupport.newFlagContainer(
+          binding.getFlags(),
+          bindingInstance,
+          this,
+          jsonKey == null ? null : jsonKey.getFlagRef());
+    }));
     this.valueConstraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IValueConstrained retval = new ValueConstraintSet();
-      FieldConstraints constraints = getBinding().getConstraint();
+      FieldConstraints constraints = binding.getConstraint();
       if (constraints != null) {
         ConstraintBindingSupport.parse(retval, constraints, ISource.modelSource(module.getLocation()));
       }
       return retval;
     }));
-    this.boundNodeItem = ObjectUtils.notNull(
-        Lazy.lazy(() -> (IAssemblyNodeItem) getContainingModule().getBoundNodeItem()
-            .getModelItemsByName(bindingInstance.getEffectiveName())
-            .get(position)));
+    this.boundNodeItem = ObjectUtils.notNull(Lazy.lazy(() -> ObjectUtils.requireNonNull(ModelSupport.toNodeItem(
+        module,
+        bindingInstance.getXmlQName(),
+        position))));
+  }
+
+  @NonNull
+  protected METASCHEMA.DefineField getBinding() {
+    return binding;
   }
 
   @Override
-  public IContainerFlagSupport<IBindingInstanceFlag> getFlagContainer() {
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
     return ObjectUtils.notNull(flagContainer.get());
   }
 
@@ -124,6 +133,15 @@ public Object getDefaultValue() {
     return defaultValue;
   }
 
+  @Override
+  public IAssemblyNodeItem getNodeItem() {
+    return boundNodeItem.get();
+  }
+
+  // ---------------------------------------
+  // - Start binding driven code - CPD-OFF -
+  // ---------------------------------------
+
   @Override
   public String getFormalName() {
     return getBinding().getFormalName();
@@ -164,17 +182,13 @@ public MarkupMultiline getRemarks() {
     return ModelSupport.remarks(getBinding().getRemarks());
   }
 
-  @Override
-  public String getJsonKeyFlagName() {
-    JsonKey jsonKey = getBinding().getJsonKey();
-    return jsonKey == null ? null : jsonKey.getFlagRef();
-  }
-
   @Override
   public IFlagInstance getJsonValueKeyFlagInstance() {
     JsonValueKeyFlag obj = getBinding().getJsonValueKeyFlag();
-    String flagName = obj == null ? null : obj.getFlagRef();
-    return flagName == null ? null : getFlagInstanceByName(flagName);
+    String name = obj == null ? null : obj.getFlagRef();
+    return name == null ? null
+        : ObjectUtils.requireNonNull(getFlagInstanceByName(
+            getContainingModule().toFlagQName(name)));
   }
 
   @Override
@@ -182,9 +196,4 @@ public String getJsonValueKeyName() {
     return getBinding().getJsonValueKey();
   }
 
-  @SuppressWarnings("null")
-  @Override
-  public INodeItem getBoundNodeItem() {
-    return boundNodeItem.get();
-  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java
index 7bf9db49f..f178f60b6 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java
@@ -31,17 +31,18 @@
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.model.AbstractGlobalFlagDefinition;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
+import gov.nist.secauto.metaschema.core.model.IFlagInstance;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.ModuleScopeEnum;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagConstraints;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FlagConstraints;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.METASCHEMA;
 
 import java.util.Map;
 import java.util.Set;
@@ -51,8 +52,9 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class DefinitionFlagGlobal
-    extends AbstractDefinition<METASCHEMA.DefineFlag>
-    implements IBindingDefinitionFlag {
+    extends AbstractGlobalFlagDefinition<IMetaschemaModule, IFlagInstance> {
+  @NonNull
+  private final METASCHEMA.DefineFlag binding;
   @NonNull
   private final Map<IAttributable.Key, Set<String>> properties;
   @NonNull
@@ -82,24 +84,29 @@ public DefinitionFlagGlobal(
       @NonNull METASCHEMA.DefineFlag binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingModule module) {
-    super(binding, module);
-    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(getBinding().getProps()));
-    this.javaTypeAdapter = ModelSupport.dataType(getBinding().getAsType());
-    this.defaultValue = ModelSupport.defaultValue(getBinding().getDefault(), this.javaTypeAdapter);
+      @NonNull IMetaschemaModule module) {
+    super(module);
+    this.binding = binding;
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.javaTypeAdapter = ModelSupport.dataType(binding.getAsType());
+    this.defaultValue = ModelSupport.defaultValue(binding.getDefault(), this.javaTypeAdapter);
     this.valueConstraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IValueConstrained retval = new ValueConstraintSet();
-      FlagConstraints constraints = getBinding().getConstraint();
+      FlagConstraints constraints = binding.getConstraint();
       if (constraints != null) {
         ConstraintBindingSupport.parse(retval, constraints, ISource.modelSource(module.getLocation()));
       }
       return retval;
     }));
-    this.boundNodeItem = ObjectUtils.notNull(
-        Lazy.lazy(() -> (IAssemblyNodeItem) getContainingModule().getBoundNodeItem()
-            .getModelItemsByName(bindingInstance.getEffectiveName())
-            .get(position)));
-    // new NodeItem(bindingInstance, position, generator)
+    this.boundNodeItem = ObjectUtils.notNull(Lazy.lazy(() -> ObjectUtils.requireNonNull(ModelSupport.toNodeItem(
+        module,
+        bindingInstance.getXmlQName(),
+        position))));
+  }
+
+  @NonNull
+  protected METASCHEMA.DefineFlag getBinding() {
+    return binding;
   }
 
   @Override
@@ -162,34 +169,8 @@ public MarkupMultiline getRemarks() {
     return ModelSupport.remarks(getBinding().getRemarks());
   }
 
-  @SuppressWarnings("null")
   @Override
-  public INodeItem getBoundNodeItem() {
+  public INodeItem getNodeItem() {
     return boundNodeItem.get();
   }
-
-  // private class NodeItem
-  // extends AbstractGroupedAssemblyInstanceNodeItem {
-  // private NodeItem(
-  // @NonNull IAssemblyInstanceGrouped instance,
-  // int position,
-  // @NonNull INodeItemGenerator generator) {
-  // super(instance, position, generator);
-  // }
-  //
-  // @Override
-  // public IAssemblyNodeItem getParentNodeItem() {
-  // return getContainingModule().getBoundNodeItem();
-  // }
-  //
-  // @Override
-  // public IAssemblyNodeItem getParentContentNodeItem() {
-  // return getParentNodeItem();
-  // }
-  //
-  // @Override
-  // public METASCHEMA.DefineFlag getValue() {
-  // return getBinding();
-  // }
-  // }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java
index 8acc7322d..072bc4926 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java
@@ -27,54 +27,42 @@
 package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
 
 import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
+import gov.nist.secauto.metaschema.core.model.IFlagContainerBuilder;
+import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
+import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.core.model.IModule;
-import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelChoiceGroup;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagReference;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineFlag;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FlagReference;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.InlineDefineFlag;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
+
+import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-public class FlagContainerSupport implements IContainerFlagSupport<IBindingInstanceFlag> {
-  private static final Logger LOGGER = LogManager.getLogger(FlagContainerSupport.class);
+@SuppressWarnings("PMD.OnlyOneReturn")
+public final class FlagContainerSupport {
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   @NonNull
-  private final Map<String, IBindingInstanceFlag> flagInstances;
-
-  @SuppressWarnings("PMD.ShortMethodName")
-  public static IContainerFlagSupport<IBindingInstanceFlag> of(
+  public static IContainerFlagSupport<IFlagInstance> newFlagContainer(
       @Nullable List<Object> flags,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
-      @NonNull IBindingDefinitionModel parent) {
-    return flags == null || flags.isEmpty()
-        ? IContainerFlagSupport.empty()
-        : new FlagContainerSupport(
-            flags,
-            bindingInstance,
-            parent);
-  }
+      @NonNull IModelDefinition parent,
+      @Nullable String jsonKeyName) {
+    if (flags == null || flags.isEmpty()) {
+      return IContainerFlagSupport.empty();
+    }
 
-  @SuppressWarnings("PMD.UseConcurrentHashMap")
-  public FlagContainerSupport(
-      @NonNull List<Object> flags,
-      @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
-      @NonNull IBindingDefinitionModel parent) {
     // create temporary collections to store the child binding objects
-    final Map<String, IBindingInstanceFlag> flagInstances = new LinkedHashMap<>();
+    IFlagContainerBuilder<IFlagInstance> builder = jsonKeyName == null
+        ? IContainerFlagSupport.builder()
+        : IContainerFlagSupport.builder(parent.getContainingModule().toFlagQName(jsonKeyName));
 
     // create counter to track child positions
     int flagReferencePosition = 0;
@@ -86,9 +74,9 @@ public FlagContainerSupport(
       IBoundInstanceModelGroupedAssembly objInstance
           = (IBoundInstanceModelGroupedAssembly) instance.getItemInstance(obj);
 
-      IBindingInstanceFlag flag;
+      IFlagInstance flag;
       if (obj instanceof InlineDefineFlag) {
-        flag = newFlagInstance(
+        flag = new InstanceFlagInline(
             (InlineDefineFlag) obj,
             objInstance,
             flagInlineDefinitionPosition++,
@@ -103,56 +91,34 @@ public FlagContainerSupport(
         throw new UnsupportedOperationException(String.format("Unknown flag instance class: %s", obj.getClass()));
       }
 
-      String key = flag.getEffectiveName();
-      flagInstances.merge(flag.getEffectiveName(), flag, (v1, v2) -> {
-        if (LOGGER.isErrorEnabled()) {
-          IModelDefinition owningDefinition = v1.getContainingDefinition();
-          IModule module = owningDefinition.getContainingModule();
-          LOGGER.error(
-              String.format(
-                  "Unexpected duplicate flag instance name '%s' in definition '%s' in module name '%s' at '%s'",
-                  key,
-                  owningDefinition.getName(),
-                  module.getShortName(),
-                  module.getLocation()));
-        }
-        return ObjectUtils.notNull(v2);
-      });
+      builder.flag(flag);
     }
 
-    this.flagInstances = flagInstances.isEmpty()
-        ? CollectionUtil.emptyMap()
-        : CollectionUtil.unmodifiableMap(flagInstances);
-  }
-
-  @Override
-  public Map<String, IBindingInstanceFlag> getFlagInstanceMap() {
-    return flagInstances;
+    return builder.build();
   }
 
-  protected static final IBindingInstanceFlag newFlagInstance(
-      @NonNull InlineDefineFlag obj,
-      @NonNull IBoundInstanceModelGroupedAssembly objInstance,
-      int position,
-      @NonNull IBindingDefinitionModel parent) {
-    return new InstanceFlagInline(obj, objInstance, position, parent);
-  }
-
-  protected static final IBindingInstanceFlag newFlagInstance(
+  @NonNull
+  private static IFlagInstance newFlagInstance(
       @NonNull FlagReference obj,
       @NonNull IBoundInstanceModelGroupedAssembly objInstance,
       int position,
-      @NonNull IBindingDefinitionModel parent) {
-    String flagName = ObjectUtils.requireNonNull(obj.getRef());
-    IBindingModule module = parent.getContainingModule();
-    IBindingDefinitionFlag definition = module.getScopedFlagDefinitionByName(flagName);
+      @NonNull IModelDefinition parent) {
+    IModule module = parent.getContainingModule();
+
+    QName qname = module.toFlagQName(ObjectUtils.requireNonNull(obj.getRef()));
+    IFlagDefinition definition = module.getScopedFlagDefinitionByName(qname);
     if (definition == null) {
       throw new IllegalStateException(
           String.format("Unable to resolve flag reference '%s' in definition '%s' in module '%s'",
-              flagName,
+              qname,
               parent.getName(),
               module.getShortName()));
     }
     return new InstanceFlagReference(obj, objInstance, position, definition, parent);
   }
+
+  private FlagContainerSupport() {
+    // disable construction
+  }
+
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/GroupAsImpl.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/GroupAsImpl.java
index 521c6823e..cc4d1ba6a 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/GroupAsImpl.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/GroupAsImpl.java
@@ -26,40 +26,34 @@
 
 package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
 
+import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IGroupAs;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.GroupAs;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.GroupingAs;
+
+import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
 class GroupAsImpl implements IGroupAs {
   @NonNull
-  private final String name;
-  @Nullable
-  private final String namespace;
+  private final QName qname;
   @NonNull
   private final JsonGroupAsBehavior jsonBehavior;
   @NonNull
   private final XmlGroupAsBehavior xmlBehavior;
 
-  public GroupAsImpl(@NonNull GroupAs groupAs) {
-    this.name = ObjectUtils.requireNonNull(groupAs.getName());
-    this.namespace = null;
+  public GroupAsImpl(@NonNull GroupingAs groupAs, @NonNull IModule module) {
+    this.qname = module.toModelQName(ObjectUtils.requireNonNull(groupAs.getName()));
     this.jsonBehavior = ModelSupport.groupAsJsonBehavior(groupAs.getInJson());
     this.xmlBehavior = ModelSupport.groupAsXmlBehavior(groupAs.getInXml());
   }
 
   @Override
-  public String getGroupAsName() {
-    return name;
-  }
-
-  @Override
-  public String getGroupAsXmlNamespace() {
-    return namespace;
+  public QName getGroupAsQName() {
+    return qname;
   }
 
   @Override
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingContainerModel.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingContainerModel.java
index 0ca3cec55..cf44f4ada 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingContainerModel.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingContainerModel.java
@@ -26,67 +26,69 @@
 
 package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
 
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute;
 import gov.nist.secauto.metaschema.core.model.IContainerModelSupport;
 import gov.nist.secauto.metaschema.core.model.IFeatureContainerModel;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingContainerModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedAbsolute;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
 
 import java.util.Collection;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface IFeatureBindingContainerModel
-    extends IBindingContainerModelAbsolute, IFeatureContainerModel<
-        IBindingInstanceModelAbsolute,
-        IBindingInstanceModelNamedAbsolute,
-        IBindingInstanceModelFieldAbsolute,
-        IBindingInstanceModelAssemblyAbsolute> {
+    extends IContainerModelAbsolute, IFeatureContainerModel<
+        IModelInstanceAbsolute,
+        INamedModelInstanceAbsolute,
+        IFieldInstanceAbsolute,
+        IAssemblyInstanceAbsolute> {
   @Override
   @NonNull
   IContainerModelSupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute> getModelContainer();
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute> getModelContainer();
 
   @Override
-  default Collection<IBindingInstanceModelAbsolute> getModelInstances() {
+  default Collection<IModelInstanceAbsolute> getModelInstances() {
     return getModelContainer().getModelInstances();
   }
 
   @Override
-  default IBindingInstanceModelNamedAbsolute getNamedModelInstanceByName(String name) {
+  default INamedModelInstanceAbsolute getNamedModelInstanceByName(QName name) {
     return getModelContainer().getNamedModelInstanceMap().get(name);
   }
 
   @SuppressWarnings("null")
   @Override
-  default Collection<IBindingInstanceModelNamedAbsolute> getNamedModelInstances() {
+  default Collection<INamedModelInstanceAbsolute> getNamedModelInstances() {
     return getModelContainer().getNamedModelInstanceMap().values();
   }
 
   @Override
-  default IBindingInstanceModelFieldAbsolute getFieldInstanceByName(String name) {
+  default IFieldInstanceAbsolute getFieldInstanceByName(QName name) {
     return getModelContainer().getFieldInstanceMap().get(name);
   }
 
   @SuppressWarnings("null")
   @Override
-  default Collection<IBindingInstanceModelFieldAbsolute> getFieldInstances() {
+  default Collection<IFieldInstanceAbsolute> getFieldInstances() {
     return getModelContainer().getFieldInstanceMap().values();
   }
 
   @Override
-  default IBindingInstanceModelAssemblyAbsolute getAssemblyInstanceByName(String name) {
+  default IAssemblyInstanceAbsolute getAssemblyInstanceByName(QName name) {
     return getModelContainer().getAssemblyInstanceMap().get(name);
   }
 
   @SuppressWarnings("null")
   @Override
-  default Collection<IBindingInstanceModelAssemblyAbsolute> getAssemblyInstances() {
+  default Collection<IAssemblyInstanceAbsolute> getAssemblyInstances() {
     return getModelContainer().getAssemblyInstanceMap().values();
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingContainerModelAssembly.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingContainerModelAssembly.java
index a69b3489b..cb2074d2e 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingContainerModelAssembly.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureBindingContainerModelAssembly.java
@@ -26,92 +26,92 @@
 
 package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
 
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
+import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
 import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport;
 import gov.nist.secauto.metaschema.core.model.IFeatureContainerModelAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingContainerModelAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceGroupBinding;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface IFeatureBindingContainerModelAssembly
-    extends IBindingContainerModelAssembly,
-    IFeatureBindingContainerModel,
+    extends IFeatureBindingContainerModel,
     IFeatureContainerModelAssembly<
-        IBindingInstanceModelAbsolute,
-        IBindingInstanceModelNamedAbsolute,
-        IBindingInstanceModelFieldAbsolute,
-        IBindingInstanceModelAssemblyAbsolute,
-        IInstanceModelChoiceBinding,
-        IInstanceModelChoiceGroupBinding> {
+        IModelInstanceAbsolute,
+        INamedModelInstanceAbsolute,
+        IFieldInstanceAbsolute,
+        IAssemblyInstanceAbsolute,
+        IChoiceInstance,
+        IChoiceGroupInstance> {
   @Override
   @NonNull
   IContainerModelAssemblySupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute,
-      IInstanceModelChoiceBinding,
-      IInstanceModelChoiceGroupBinding> getModelContainer();
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute,
+      IChoiceInstance,
+      IChoiceGroupInstance> getModelContainer();
 
   @Override
-  default Collection<IBindingInstanceModelAbsolute> getModelInstances() {
+  default Collection<IModelInstanceAbsolute> getModelInstances() {
     return getModelContainer().getModelInstances();
   }
 
   @Override
-  default IBindingInstanceModelNamedAbsolute getNamedModelInstanceByName(String name) {
+  default INamedModelInstanceAbsolute getNamedModelInstanceByName(QName name) {
     return getModelContainer().getNamedModelInstanceMap().get(name);
   }
 
   @SuppressWarnings("null")
   @Override
-  default Collection<IBindingInstanceModelNamedAbsolute> getNamedModelInstances() {
+  default Collection<INamedModelInstanceAbsolute> getNamedModelInstances() {
     return getModelContainer().getNamedModelInstanceMap().values();
   }
 
   @Override
-  default IBindingInstanceModelFieldAbsolute getFieldInstanceByName(String name) {
+  default IFieldInstanceAbsolute getFieldInstanceByName(QName name) {
     return getModelContainer().getFieldInstanceMap().get(name);
   }
 
   @SuppressWarnings("null")
   @Override
-  default Collection<IBindingInstanceModelFieldAbsolute> getFieldInstances() {
+  default Collection<IFieldInstanceAbsolute> getFieldInstances() {
     return getModelContainer().getFieldInstanceMap().values();
   }
 
   @Override
-  default IBindingInstanceModelAssemblyAbsolute getAssemblyInstanceByName(String name) {
+  default IAssemblyInstanceAbsolute getAssemblyInstanceByName(QName name) {
     return getModelContainer().getAssemblyInstanceMap().get(name);
   }
 
   @SuppressWarnings("null")
   @Override
-  default Collection<IBindingInstanceModelAssemblyAbsolute> getAssemblyInstances() {
+  default Collection<IAssemblyInstanceAbsolute> getAssemblyInstances() {
     return getModelContainer().getAssemblyInstanceMap().values();
   }
 
   @Override
-  default List<IInstanceModelChoiceBinding> getChoiceInstances() {
+  default List<IChoiceInstance> getChoiceInstances() {
     return getModelContainer().getChoiceInstances();
   }
 
   @Override
-  default IInstanceModelChoiceGroupBinding getChoiceGroupInstanceByName(String name) {
+  default IChoiceGroupInstance getChoiceGroupInstanceByName(String name) {
     return getModelContainer().getChoiceGroupInstanceMap().get(name);
   }
 
   @Override
-  default Map<String, IInstanceModelChoiceGroupBinding> getChoiceGroupInstances() {
+  default Map<String, IChoiceGroupInstance> getChoiceGroupInstances() {
     return getModelContainer().getChoiceGroupInstanceMap();
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureInstanceModelGroupAs.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureInstanceModelGroupAs.java
index b724b7825..3e98330c2 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureInstanceModelGroupAs.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/IFeatureInstanceModelGroupAs.java
@@ -26,14 +26,14 @@
 
 package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
 
+import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior;
 import gov.nist.secauto.metaschema.databind.model.IGroupAs;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAbsolute;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-public interface IFeatureInstanceModelGroupAs extends IBindingInstanceModelAbsolute {
+public interface IFeatureInstanceModelGroupAs extends IModelInstanceAbsolute {
   @NonNull
   IGroupAs getGroupAs();
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java
index 5aad8f90d..efe5b02ef 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java
@@ -30,19 +30,19 @@
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineFlagDefinition;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
+import gov.nist.secauto.metaschema.core.model.IFeatureValueless;
+import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
+import gov.nist.secauto.metaschema.core.model.IFlagInstance;
+import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagConstraints;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineFlag;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FlagConstraints;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.InlineDefineFlag;
 
 import java.util.Map;
 import java.util.Set;
@@ -52,9 +52,13 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceFlagInline
-    extends AbstractInstance<InlineDefineFlag>
-    implements IBindingInstanceFlag, IBindingDefinitionFlag,
-    IFeatureDefinitionInstanceInlined<IBindingDefinitionFlag, IBindingInstanceFlag> {
+    extends AbstractInlineFlagDefinition<
+        IModelDefinition,
+        IFlagDefinition,
+        IFlagInstance>
+    implements IFeatureValueless {
+  @NonNull
+  private final InlineDefineFlag binding;
   @NonNull
   private final Map<IAttributable.Key, Set<String>> properties;
   @NonNull
@@ -70,34 +74,39 @@ public InstanceFlagInline(
       @NonNull InlineDefineFlag binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingDefinitionModel parent) {
-    super(binding, parent);
-    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(getBinding().getProps()));
-    this.javaTypeAdapter = ModelSupport.dataType(getBinding().getAsType());
-    this.defaultValue = ModelSupport.defaultValue(getBinding().getDefault(), this.javaTypeAdapter);
+      @NonNull IModelDefinition parent) {
+    super(parent);
+    this.binding = binding;
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.javaTypeAdapter = ModelSupport.dataType(binding.getAsType());
+    this.defaultValue = ModelSupport.defaultValue(binding.getDefault(), this.javaTypeAdapter);
     this.valueConstraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IValueConstrained retval = new ValueConstraintSet();
-      FlagConstraints constraints = getBinding().getConstraint();
+      FlagConstraints constraints = binding.getConstraint();
       if (constraints != null) {
         ConstraintBindingSupport.parse(retval, constraints, ISource.modelSource());
       }
       return retval;
     }));
     this.boundNodeItem = ObjectUtils.notNull(
-        Lazy.lazy(() -> (IAssemblyNodeItem) getContainingModule().getBoundNodeItem()
-            .getModelItemsByName(bindingInstance.getEffectiveName())
+        Lazy.lazy(() -> (IAssemblyNodeItem) ObjectUtils.notNull(getContainingModule().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
             .get(position)));
   }
 
+  @NonNull
+  protected InlineDefineFlag getBinding() {
+    return binding;
+  }
+
   @SuppressWarnings("null")
   @Override
   public IValueConstrained getConstraintSupport() {
     return valueConstraints.get();
   }
 
-  @SuppressWarnings("null")
   @Override
-  public INodeItem getBoundNodeItem() {
+  public IAssemblyNodeItem getNodeItem() {
     return boundNodeItem.get();
   }
 
@@ -116,16 +125,6 @@ public Object getDefaultValue() {
     return defaultValue;
   }
 
-  @Override
-  public IBindingInstanceFlag getInlineInstance() {
-    return this;
-  }
-
-  @Override
-  public IBindingDefinitionFlag getDefinition() {
-    return this;
-  }
-
   @Override
   public String getName() {
     return ObjectUtils.notNull(getBinding().getName());
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java
index a4402a51d..281c18821 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java
@@ -29,15 +29,15 @@
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
+import gov.nist.secauto.metaschema.core.model.AbstractFlagInstance;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
+import gov.nist.secauto.metaschema.core.model.IFeatureValueless;
+import gov.nist.secauto.metaschema.core.model.IFlagDefinition;
+import gov.nist.secauto.metaschema.core.model.IFlagInstance;
+import gov.nist.secauto.metaschema.core.model.IModelDefinition;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModel;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FlagReference;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FlagReference;
 
 import java.util.Map;
 import java.util.Set;
@@ -47,11 +47,14 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceFlagReference
-    extends AbstractInstance<FlagReference>
-    implements IBindingInstanceFlag,
-    IFeatureDefinitionReferenceInstance<IBindingDefinitionFlag, IBindingInstanceFlag> {
+    extends AbstractFlagInstance<
+        IModelDefinition,
+        IFlagDefinition, IFlagInstance>
+    implements IFeatureValueless {
   @NonNull
-  private final IBindingDefinitionFlag definition;
+  private final FlagReference binding;
+  @NonNull
+  private final IFlagDefinition definition;
   @NonNull
   private final Map<IAttributable.Key, Set<String>> properties;
   @Nullable
@@ -60,29 +63,34 @@ public class InstanceFlagReference
   private final Lazy<IAssemblyNodeItem> boundNodeItem;
 
   public InstanceFlagReference(
-      @NonNull FlagReference obj,
+      @NonNull FlagReference binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingDefinitionFlag definition,
-      @NonNull IBindingDefinitionModel parent) {
-    super(obj, parent);
+      @NonNull IFlagDefinition definition,
+      @NonNull IModelDefinition parent) {
+    super(parent);
+    this.binding = binding;
     this.definition = definition;
-    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(getBinding().getProps()));
-    this.defaultValue = ModelSupport.defaultValue(getBinding().getDefault(), definition.getJavaTypeAdapter());
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.defaultValue = ModelSupport.defaultValue(binding.getDefault(), definition.getJavaTypeAdapter());
     this.boundNodeItem = ObjectUtils.notNull(
-        Lazy.lazy(() -> (IAssemblyNodeItem) getContainingModule().getBoundNodeItem()
-            .getModelItemsByName(bindingInstance.getEffectiveName())
+        Lazy.lazy(() -> (IAssemblyNodeItem) ObjectUtils.notNull(getContainingModule().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
             .get(position)));
   }
 
-  @SuppressWarnings("null")
+  @NonNull
+  protected FlagReference getBinding() {
+    return binding;
+  }
+
   @Override
-  public INodeItem getBoundNodeItem() {
+  public IAssemblyNodeItem getNodeItem() {
     return boundNodeItem.get();
   }
 
   @Override
-  public IBindingDefinitionFlag getDefinition() {
+  public IFlagDefinition getDefinition() {
     return definition;
   }
 
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java
index b9801eb8a..8acda7925 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java
@@ -28,52 +28,71 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IAttributable;
+import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
+import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
 import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
+import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute;
 import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
-import gov.nist.secauto.metaschema.core.model.IGroupable;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IFlagInstance;
+import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet;
 import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingContainerModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceGroupBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyConstraints;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey;
+import gov.nist.secauto.metaschema.databind.model.IGroupAs;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyConstraints;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.InlineDefineAssembly;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.JsonKey;
 
 import java.math.BigInteger;
+import java.util.Map;
+import java.util.Set;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceModelAssemblyInline
-    extends AbstractInstanceModelNamedInline<
-        InlineDefineAssembly,
-        IBindingContainerModelAbsolute>
-    implements IBindingInstanceModelAssemblyAbsolute, IBindingDefinitionAssembly,
-    IFeatureDefinitionInstanceInlined<IBindingDefinitionAssembly, IBindingInstanceModelAssemblyAbsolute>,
-    IFeatureBindingContainerFlag,
+    extends AbstractInlineAssemblyDefinition<
+        IContainerModelAbsolute,
+        IAssemblyDefinition,
+        IAssemblyInstanceAbsolute,
+        IAssemblyDefinition,
+        IFlagInstance,
+        IModelInstanceAbsolute,
+        INamedModelInstanceAbsolute,
+        IFieldInstanceAbsolute,
+        IAssemblyInstanceAbsolute,
+        IChoiceInstance,
+        IChoiceGroupInstance>
+    implements IAssemblyInstanceAbsolute, IFeatureInstanceModelGroupAs,
     IFeatureBindingContainerModelAssembly {
   @NonNull
-  private final Lazy<IContainerFlagSupport<IBindingInstanceFlag>> flagContainer;
+  private final InlineDefineAssembly binding;
+  @NonNull
+  private final Map<IAttributable.Key, Set<String>> properties;
+  @NonNull
+  private final IGroupAs groupAs;
+  @NonNull
+  private final Lazy<IAssemblyNodeItem> boundNodeItem;
+  @NonNull
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IContainerModelAssemblySupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute,
-      IInstanceModelChoiceBinding,
-      IInstanceModelChoiceGroupBinding>> modelContainer;
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute,
+      IChoiceInstance,
+      IChoiceGroupInstance>> modelContainer;
   @NonNull
   private final Lazy<IModelConstrained> modelConstraints;
 
@@ -96,21 +115,28 @@ public InstanceModelAssemblyInline(
       @NonNull InlineDefineAssembly binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingContainerModelAbsolute parent,
+      @NonNull IContainerModelAbsolute parent,
       @NonNull INodeItemFactory nodeItemFactory) {
-    super(binding,
-        bindingInstance,
-        position,
-        parent,
-        ObjectUtils.requireNonNull(binding.getProps()),
-        binding.getGroupAs());
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> FlagContainerSupport.of(
-        binding.getFlags(),
-        bindingInstance,
-        this)));
+    super(parent);
+    this.binding = binding;
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.groupAs = ModelSupport.groupAs(binding.getGroupAs(), parent.getOwningDefinition().getContainingModule());
+    this.boundNodeItem = ObjectUtils.notNull(
+        Lazy.lazy(() -> (IAssemblyNodeItem) ObjectUtils.notNull(getContainingDefinition().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
+            .get(position)));
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> {
+      JsonKey jsonKey = getBinding().getJsonKey();
+      return FlagContainerSupport.newFlagContainer(
+          binding.getFlags(),
+          bindingInstance,
+          this,
+          jsonKey == null ? null : jsonKey.getFlagRef());
+    }));
     this.modelContainer = ObjectUtils.notNull(Lazy.lazy(() -> AssemblyModelContainerSupport.of(
         binding.getModel(),
-        ObjectUtils.requireNonNull(bindingInstance.getDefinition().getAssemblyInstanceByName("model")),
+        ObjectUtils
+            .requireNonNull(bindingInstance.getDefinition().getAssemblyInstanceByName(MODEL_QNAME)),
         this,
         nodeItemFactory)));
     this.modelConstraints = ObjectUtils.notNull(Lazy.lazy(() -> {
@@ -126,20 +152,41 @@ public InstanceModelAssemblyInline(
     }));
   }
 
+  @NonNull
+  protected InlineDefineAssembly getBinding() {
+    getContainingDefinition();
+    return binding;
+  }
+
+  @Override
+  public Map<IAttributable.Key, Set<String>> getProperties() {
+    return properties;
+  }
+
+  @Override
+  public IGroupAs getGroupAs() {
+    return groupAs;
+  }
+
+  @Override
+  public IAssemblyNodeItem getNodeItem() {
+    return boundNodeItem.get();
+  }
+
   @SuppressWarnings("null")
   @Override
-  public IContainerFlagSupport<IBindingInstanceFlag> getFlagContainer() {
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
     return flagContainer.get();
   }
 
   @Override
   public IContainerModelAssemblySupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute,
-      IInstanceModelChoiceBinding,
-      IInstanceModelChoiceGroupBinding> getModelContainer() {
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute,
+      IChoiceInstance,
+      IChoiceGroupInstance> getModelContainer() {
     return ObjectUtils.notNull(modelContainer.get());
   }
 
@@ -148,15 +195,9 @@ public IModelConstrained getConstraintSupport() {
     return ObjectUtils.notNull(modelConstraints.get());
   }
 
-  @Override
-  public InstanceModelAssemblyInline getDefinition() {
-    return this;
-  }
-
-  @Override
-  public IBindingInstanceModelAssemblyAbsolute getInlineInstance() {
-    return this;
-  }
+  // ---------------------------------------
+  // - Start binding driven code - CPD-OFF -
+  // ---------------------------------------
 
   @Override
   public String getName() {
@@ -183,23 +224,15 @@ public MarkupMultiline getRemarks() {
     return ModelSupport.remarks(getBinding().getRemarks());
   }
 
-  @Override
-  public String getJsonKeyFlagName() {
-    JsonKey jsonKey = getBinding().getJsonKey();
-    return jsonKey == null ? null : jsonKey.getFlagRef();
-  }
-
   @Override
   public int getMinOccurs() {
     BigInteger min = getBinding().getMinOccurs();
-    return min == null ? IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS : min.intValueExact();
+    return min == null ? DEFAULT_GROUP_AS_MIN_OCCURS : min.intValueExact();
   }
 
   @Override
   public int getMaxOccurs() {
     String max = getBinding().getMaxOccurs();
-    return max == null
-        ? IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS
-        : ModelSupport.maxOccurs(max);
+    return max == null ? DEFAULT_GROUP_AS_MAX_OCCURS : ModelSupport.maxOccurs(max);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java
index 710edcb55..0fd224124 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java
@@ -28,26 +28,42 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
-import gov.nist.secauto.metaschema.core.model.IGroupable;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
+import gov.nist.secauto.metaschema.core.model.AbstractAssemblyInstance;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IAttributable;
+import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingContainerModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyReference;
+import gov.nist.secauto.metaschema.databind.model.IGroupAs;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyReference;
 
 import java.math.BigInteger;
+import java.util.Map;
+import java.util.Set;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceModelAssemblyReference
-    extends AbstractInstanceModelNamedReference<
-        AssemblyReference,
-        IBindingDefinitionAssembly,
-        IBindingContainerModelAbsolute>
-    implements IBindingInstanceModelAssemblyAbsolute,
-    IFeatureDefinitionReferenceInstance<IBindingDefinitionAssembly, IBindingInstanceModelAssemblyAbsolute> {
+    extends AbstractAssemblyInstance<
+        IContainerModelAbsolute,
+        IAssemblyDefinition,
+        IAssemblyInstanceAbsolute,
+        IAssemblyDefinition>
+    implements IAssemblyInstanceAbsolute, IFeatureInstanceModelGroupAs {
+  @NonNull
+  private final AssemblyReference binding;
+  @NonNull
+  private final IAssemblyDefinition definition;
+  @NonNull
+  private final Map<IAttributable.Key, Set<String>> properties;
+  @NonNull
+  private final IGroupAs groupAs;
+  @NonNull
+  private final Lazy<IAssemblyNodeItem> boundNodeItem;
+
   /**
    * Construct a new assembly reference.
    *
@@ -67,15 +83,51 @@ public InstanceModelAssemblyReference(
       @NonNull AssemblyReference binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingDefinitionAssembly definition,
-      @NonNull IBindingContainerModelAbsolute parent) {
-    super(binding,
-        bindingInstance,
-        position,
-        definition,
-        parent,
-        ObjectUtils.requireNonNull(binding.getProps()),
-        binding.getGroupAs());
+      @NonNull IAssemblyDefinition definition,
+      @NonNull IContainerModelAbsolute parent) {
+    super(parent);
+    this.binding = binding;
+    this.definition = definition;
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.groupAs = ModelSupport.groupAs(binding.getGroupAs(), parent.getOwningDefinition().getContainingModule());
+    this.boundNodeItem = ObjectUtils.notNull(
+        Lazy.lazy(() -> (IAssemblyNodeItem) ObjectUtils.notNull(getContainingDefinition().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
+            .get(position)));
+  }
+
+  @Override
+  public IAssemblyDefinition getDefinition() {
+    return definition;
+  }
+
+  @NonNull
+  protected AssemblyReference getBinding() {
+    return binding;
+  }
+
+  @Override
+  public Map<IAttributable.Key, Set<String>> getProperties() {
+    return properties;
+  }
+
+  @Override
+  public IGroupAs getGroupAs() {
+    return groupAs;
+  }
+
+  @Override
+  public IAssemblyNodeItem getNodeItem() {
+    return boundNodeItem.get();
+  }
+
+  // ---------------------------------------
+  // - Start binding driven code - CPD-OFF -
+  // ---------------------------------------
+
+  @Override
+  public String getName() {
+    return getDefinition().getName();
   }
 
   @Override
@@ -111,14 +163,12 @@ public MarkupMultiline getRemarks() {
   @Override
   public int getMinOccurs() {
     BigInteger min = getBinding().getMinOccurs();
-    return min == null ? IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS : min.intValueExact();
+    return min == null ? DEFAULT_GROUP_AS_MIN_OCCURS : min.intValueExact();
   }
 
   @Override
   public int getMaxOccurs() {
     String max = getBinding().getMaxOccurs();
-    return max == null
-        ? IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS
-        : ModelSupport.maxOccurs(max);
+    return max == null ? DEFAULT_GROUP_AS_MAX_OCCURS : ModelSupport.maxOccurs(max);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java
index cea342f94..178275bf4 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java
@@ -28,32 +28,37 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
+import gov.nist.secauto.metaschema.core.model.AbstractChoiceInstance;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IContainerModelSupport;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel.Choice;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel.Choice;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceModelChoice
-    extends AbstractInstanceModel<Choice, IBindingDefinitionAssembly>
-    implements IInstanceModelChoiceBinding,
-    IFeatureBindingContainerModel {
+    extends AbstractChoiceInstance<
+        IAssemblyDefinition,
+        IModelInstanceAbsolute,
+        INamedModelInstanceAbsolute,
+        IFieldInstanceAbsolute,
+        IAssemblyInstanceAbsolute> {
+  @NonNull
+  private final AssemblyModel.Choice binding;
   @NonNull
   private final Lazy<IContainerModelSupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute>> modelContainer;
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute>> modelContainer;
   @NonNull
   private final Lazy<IAssemblyNodeItem> boundNodeItem;
 
@@ -61,48 +66,53 @@ public InstanceModelChoice(
       @NonNull Choice binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingDefinitionAssembly parent,
+      @NonNull IAssemblyDefinition parent,
       @NonNull INodeItemFactory nodeItemFactory) {
-    super(binding, parent);
+    super(parent);
+    this.binding = binding;
     this.modelContainer = ObjectUtils.notNull(Lazy.lazy(() -> ChoiceModelContainerSupport.of(
         binding,
         bindingInstance,
         this,
         nodeItemFactory)));
     this.boundNodeItem = ObjectUtils.notNull(
-        Lazy.lazy(() -> (IAssemblyNodeItem) getContainingDefinition().getBoundNodeItem()
-            .getModelItemsByName(bindingInstance.getEffectiveName())
+        Lazy.lazy(() -> (IAssemblyNodeItem) ObjectUtils.notNull(getContainingDefinition().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
             .get(position)));
   }
 
+  @NonNull
+  protected AssemblyModel.Choice getBinding() {
+    return binding;
+  }
+
   @Override
   public IContainerModelSupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute> getModelContainer() {
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute> getModelContainer() {
     return ObjectUtils.notNull(modelContainer.get());
   }
 
-  @SuppressWarnings("null")
   @Override
-  public INodeItem getBoundNodeItem() {
+  public IAssemblyNodeItem getNodeItem() {
     return boundNodeItem.get();
   }
 
   @Override
-  public IBindingDefinitionAssembly getOwningDefinition() {
+  public IAssemblyDefinition getOwningDefinition() {
     return getContainingDefinition();
   }
 
   @Override
-  public String getJsonKeyFlagName() {
+  public MarkupMultiline getRemarks() {
+    // no remarks
     return null;
   }
 
   @Override
-  public MarkupMultiline getRemarks() {
-    // no remarks
+  public String getGroupAsXmlNamespace() {
     return null;
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java
index 1ecc3cf34..5a1ae62e8 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java
@@ -27,22 +27,18 @@
 package gov.nist.secauto.metaschema.databind.model.metaschema.impl;
 
 import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
-import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
+import gov.nist.secauto.metaschema.core.model.AbstractChoiceGroupInstance;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped;
 import gov.nist.secauto.metaschema.core.model.IContainerModelSupport;
-import gov.nist.secauto.metaschema.core.model.IFeatureContainerModelGrouped;
-import gov.nist.secauto.metaschema.core.model.IGroupable;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstanceGrouped;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
 import gov.nist.secauto.metaschema.databind.model.IGroupAs;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyGrouped;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldGrouped;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedGrouped;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceGroupBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.JsonKey;
 
 import java.math.BigInteger;
 
@@ -50,21 +46,22 @@
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceModelChoiceGroup
-    extends AbstractInstanceModel<AssemblyModel.ChoiceGroup, IBindingDefinitionAssembly>
-    implements IInstanceModelChoiceGroupBinding,
-    IFeatureContainerModelGrouped<
-        IBindingInstanceModelNamedGrouped,
-        IBindingInstanceModelFieldGrouped,
-        IBindingInstanceModelAssemblyGrouped>,
-    IFeatureInstanceModelGroupAs {
+    extends AbstractChoiceGroupInstance<
+        IAssemblyDefinition,
+        INamedModelInstanceGrouped,
+        IFieldInstanceGrouped,
+        IAssemblyInstanceGrouped>
+    implements IFeatureInstanceModelGroupAs {
+  @NonNull
+  private final AssemblyModel.ChoiceGroup binding;
   @NonNull
   private final IGroupAs groupAs;
   @NonNull
   private final Lazy<IContainerModelSupport<
-      IBindingInstanceModelNamedGrouped,
-      IBindingInstanceModelNamedGrouped,
-      IBindingInstanceModelFieldGrouped,
-      IBindingInstanceModelAssemblyGrouped>> modelContainer;
+      INamedModelInstanceGrouped,
+      INamedModelInstanceGrouped,
+      IFieldInstanceGrouped,
+      IAssemblyInstanceGrouped>> modelContainer;
   @NonNull
   private final Lazy<IAssemblyNodeItem> boundNodeItem;
 
@@ -72,27 +69,33 @@ public InstanceModelChoiceGroup(
       @NonNull AssemblyModel.ChoiceGroup binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingDefinitionAssembly parent,
+      @NonNull IAssemblyDefinition parent,
       @NonNull INodeItemFactory nodeItemFactory) {
-    super(binding, parent);
-    this.groupAs = ModelSupport.groupAs(binding.getGroupAs());
+    super(parent);
+    this.binding = binding;
+    this.groupAs = ModelSupport.groupAs(binding.getGroupAs(), parent.getContainingModule());
     this.modelContainer = ObjectUtils.notNull(Lazy.lazy(() -> ChoiceGroupModelContainerSupport.of(
         binding,
         bindingInstance,
         this,
         nodeItemFactory)));
     this.boundNodeItem = ObjectUtils.notNull(
-        Lazy.lazy(() -> (IAssemblyNodeItem) getContainingDefinition().getBoundNodeItem()
-            .getModelItemsByName(bindingInstance.getJsonName())
+        Lazy.lazy(() -> (IAssemblyNodeItem) ObjectUtils.notNull(getContainingDefinition().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
             .get(position)));
   }
 
+  @NonNull
+  protected AssemblyModel.ChoiceGroup getBinding() {
+    return binding;
+  }
+
   @Override
   public IContainerModelSupport<
-      IBindingInstanceModelNamedGrouped,
-      IBindingInstanceModelNamedGrouped,
-      IBindingInstanceModelFieldGrouped,
-      IBindingInstanceModelAssemblyGrouped> getModelContainer() {
+      INamedModelInstanceGrouped,
+      INamedModelInstanceGrouped,
+      IFieldInstanceGrouped,
+      IAssemblyInstanceGrouped> getModelContainer() {
     return ObjectUtils.notNull(modelContainer.get());
   }
 
@@ -101,39 +104,40 @@ public IGroupAs getGroupAs() {
     return groupAs;
   }
 
-  @SuppressWarnings("null")
   @Override
-  public INodeItem getBoundNodeItem() {
+  public IAssemblyNodeItem getNodeItem() {
     return boundNodeItem.get();
   }
 
+  // ---------------------------------------
+  // - Start binding driven code - CPD-OFF -
+  // ---------------------------------------
+
   @Override
   public int getMinOccurs() {
     BigInteger min = getBinding().getMinOccurs();
-    return min == null ? IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS : min.intValueExact();
+    return min == null ? DEFAULT_GROUP_AS_MIN_OCCURS : min.intValueExact();
   }
 
   @Override
   public int getMaxOccurs() {
     String max = getBinding().getMaxOccurs();
-    return max == null
-        ? IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS
-        : ModelSupport.maxOccurs(max);
+    return max == null ? DEFAULT_GROUP_AS_MAX_OCCURS : ModelSupport.maxOccurs(max);
   }
 
   @Override
-  public IBindingDefinitionAssembly getOwningDefinition() {
-    return getContainingDefinition();
+  public IAssemblyDefinition getOwningDefinition() {
+    return getParentContainer();
   }
 
   @Override
   public String getJsonDiscriminatorProperty() {
     String discriminator = getBinding().getDiscriminator();
-    return discriminator == null ? IChoiceGroupInstance.DEFAULT_JSON_DISCRIMINATOR_PROPERTY_NAME : discriminator;
+    return discriminator == null ? DEFAULT_JSON_DISCRIMINATOR_PROPERTY_NAME : discriminator;
   }
 
   @Override
-  public String getJsonKeyFlagName() {
+  public String getJsonKeyFlagInstanceName() {
     JsonKey jsonKey = getBinding().getJsonKey();
     return jsonKey == null ? null : jsonKey.getFlagRef();
   }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java
index 1ea239a10..b878660d9 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java
@@ -29,42 +29,58 @@
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
+import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute;
+import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
-import gov.nist.secauto.metaschema.core.model.IGroupable;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingContainerModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelField;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldConstraints;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.InlineDefineField;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonKey;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag;
+import gov.nist.secauto.metaschema.databind.model.IGroupAs;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FieldConstraints;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.InlineDefineField;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.JsonKey;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.JsonValueKeyFlag;
 
 import java.math.BigInteger;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceModelFieldInline
-    extends AbstractInstanceModelNamedInline<InlineDefineField,
-        IBindingContainerModelAbsolute>
-    implements IBindingInstanceModelFieldAbsolute, IBindingDefinitionModelField,
-    IFeatureDefinitionInstanceInlined<IBindingDefinitionModelField, IBindingInstanceModelFieldAbsolute>,
-    IFeatureBindingContainerFlag {
+    extends AbstractInlineFieldDefinition<
+        IContainerModelAbsolute,
+        IFieldDefinition,
+        IFieldInstanceAbsolute,
+        IAssemblyDefinition,
+        IFlagInstance>
+    implements IFieldInstanceAbsolute, IFeatureInstanceModelGroupAs {
+  @NonNull
+  private final InlineDefineField binding;
+  @NonNull
+  private final Map<IAttributable.Key, Set<String>> properties;
+  @NonNull
+  private final IGroupAs groupAs;
+  @NonNull
+  private final Lazy<IAssemblyNodeItem> boundNodeItem;
   @NonNull
   private final IDataTypeAdapter<?> javaTypeAdapter;
   @Nullable
   private final Object defaultValue;
   @NonNull
-  private final Lazy<IContainerFlagSupport<IBindingInstanceFlag>> flagContainer;
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IValueConstrained> valueConstraints;
 
@@ -72,22 +88,28 @@ public InstanceModelFieldInline(
       @NonNull InlineDefineField binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingContainerModelAbsolute parent) {
-    super(binding,
-        bindingInstance,
-        position,
-        parent,
-        ObjectUtils.requireNonNull(binding.getProps()),
-        binding.getGroupAs());
-    this.javaTypeAdapter = ModelSupport.dataType(getBinding().getAsType());
-    this.defaultValue = ModelSupport.defaultValue(getBinding().getDefault(), this.javaTypeAdapter);
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> FlagContainerSupport.of(
-        binding.getFlags(),
-        bindingInstance,
-        this)));
+      @NonNull IContainerModelAbsolute parent) {
+    super(parent);
+    this.binding = binding;
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.groupAs = ModelSupport.groupAs(binding.getGroupAs(), parent.getOwningDefinition().getContainingModule());
+    this.boundNodeItem = ObjectUtils.notNull(
+        Lazy.lazy(() -> (IAssemblyNodeItem) ObjectUtils.notNull(getContainingDefinition().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
+            .get(position)));
+    this.javaTypeAdapter = ModelSupport.dataType(binding.getAsType());
+    this.defaultValue = ModelSupport.defaultValue(binding.getDefault(), this.javaTypeAdapter);
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> {
+      JsonKey jsonKey = binding.getJsonKey();
+      return FlagContainerSupport.newFlagContainer(
+          binding.getFlags(),
+          bindingInstance,
+          this,
+          jsonKey == null ? null : jsonKey.getFlagRef());
+    }));
     this.valueConstraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IValueConstrained retval = new ValueConstraintSet();
-      FieldConstraints constraints = getBinding().getConstraint();
+      FieldConstraints constraints = binding.getConstraint();
       if (constraints != null) {
         ConstraintBindingSupport.parse(
             retval,
@@ -98,13 +120,23 @@ public InstanceModelFieldInline(
     }));
   }
 
+  @NonNull
+  protected InlineDefineField getBinding() {
+    return binding;
+  }
+
   @Override
-  public boolean isInXmlWrapped() {
-    return ModelSupport.fieldInXml(getBinding().getInXml());
+  public Map<IAttributable.Key, Set<String>> getProperties() {
+    return properties;
+  }
+
+  @Override
+  public IGroupAs getGroupAs() {
+    return groupAs;
   }
 
   @Override
-  public IContainerFlagSupport<IBindingInstanceFlag> getFlagContainer() {
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
     return ObjectUtils.notNull(flagContainer.get());
   }
 
@@ -119,18 +151,22 @@ public IDataTypeAdapter<?> getJavaTypeAdapter() {
   }
 
   @Override
-  public InstanceModelFieldInline getDefinition() {
-    return this;
+  public Object getDefaultValue() {
+    return defaultValue;
   }
 
   @Override
-  public IBindingInstanceModelFieldAbsolute getInlineInstance() {
-    return this;
+  public IAssemblyNodeItem getNodeItem() {
+    return boundNodeItem.get();
   }
 
+  // ---------------------------------------
+  // - Start binding driven code - CPD-OFF -
+  // ---------------------------------------
+
   @Override
-  public Object getDefaultValue() {
-    return defaultValue;
+  public boolean isInXmlWrapped() {
+    return ModelSupport.fieldInXml(getBinding().getInXml());
   }
 
   @Override
@@ -158,31 +194,26 @@ public MarkupMultiline getRemarks() {
     return ModelSupport.remarks(getBinding().getRemarks());
   }
 
-  @Override
-  public String getJsonKeyFlagName() {
-    JsonKey jsonKey = getBinding().getJsonKey();
-    return jsonKey == null ? null : jsonKey.getFlagRef();
-  }
-
   @Override
   public int getMinOccurs() {
     BigInteger min = getBinding().getMinOccurs();
-    return min == null ? IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS : min.intValueExact();
+    return min == null ? DEFAULT_GROUP_AS_MIN_OCCURS : min.intValueExact();
   }
 
   @Override
   public int getMaxOccurs() {
     String max = getBinding().getMaxOccurs();
-    return max == null
-        ? IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS
-        : ModelSupport.maxOccurs(max);
+    return max == null ? DEFAULT_GROUP_AS_MAX_OCCURS : ModelSupport.maxOccurs(max);
   }
 
   @Override
   public IFlagInstance getJsonValueKeyFlagInstance() {
     JsonValueKeyFlag obj = getBinding().getJsonValueKeyFlag();
-    String flagName = obj == null ? null : obj.getFlagRef();
-    return flagName == null ? null : getFlagInstanceByName(flagName);
+    String name = obj == null ? null : obj.getFlagRef();
+    String namespace = getContainingModule().getXmlNamespace().toASCIIString();
+    return name == null ? null
+        : ObjectUtils.requireNonNull(getFlagInstanceByName(
+            new QName(namespace, name)));
   }
 
   @Override
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java
index c16c9c76e..d842c2ab2 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java
@@ -28,27 +28,43 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
-import gov.nist.secauto.metaschema.core.model.IGroupable;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
+import gov.nist.secauto.metaschema.core.model.AbstractFieldInstance;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAttributable;
+import gov.nist.secauto.metaschema.core.model.IContainerModelAbsolute;
+import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingContainerModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelField;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldReference;
+import gov.nist.secauto.metaschema.databind.model.IGroupAs;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FieldReference;
 
 import java.math.BigInteger;
+import java.util.Map;
+import java.util.Set;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceModelFieldReference
-    extends AbstractInstanceModelNamedReference<
-        FieldReference,
-        IBindingDefinitionModelField,
-        IBindingContainerModelAbsolute>
-    implements IBindingInstanceModelFieldAbsolute,
-    IFeatureDefinitionReferenceInstance<IBindingDefinitionModelField, IBindingInstanceModelFieldAbsolute> {
+    extends AbstractFieldInstance<
+        IContainerModelAbsolute,
+        IFieldDefinition,
+        IFieldInstanceAbsolute,
+        IAssemblyDefinition>
+    implements IFieldInstanceAbsolute, IFeatureInstanceModelGroupAs {
+  @NonNull
+  private final FieldReference binding;
+  @NonNull
+  private final IFieldDefinition definition;
+  @NonNull
+  private final Map<IAttributable.Key, Set<String>> properties;
+  @NonNull
+  private final IGroupAs groupAs;
+  @NonNull
+  private final Lazy<IAssemblyNodeItem> boundNodeItem;
   @Nullable
   private final Object defaultValue;
 
@@ -56,19 +72,49 @@ public InstanceModelFieldReference(
       @NonNull FieldReference binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingDefinitionModelField definition,
-      @NonNull IBindingContainerModelAbsolute parent) {
-    super(
-        binding,
-        bindingInstance,
-        position,
-        definition,
-        parent,
-        ObjectUtils.requireNonNull(binding.getProps()),
-        binding.getGroupAs());
-    this.defaultValue = ModelSupport.defaultValue(getBinding().getDefault(), definition.getJavaTypeAdapter());
+      @NonNull IFieldDefinition definition,
+      @NonNull IContainerModelAbsolute parent) {
+    super(parent);
+    this.binding = binding;
+    this.definition = definition;
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.groupAs = ModelSupport.groupAs(binding.getGroupAs(), parent.getOwningDefinition().getContainingModule());
+    this.boundNodeItem = ObjectUtils.notNull(
+        Lazy.lazy(() -> (IAssemblyNodeItem) ObjectUtils.notNull(getContainingDefinition().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
+            .get(position)));
+    this.defaultValue = ModelSupport.defaultValue(binding.getDefault(), definition.getJavaTypeAdapter());
   }
 
+  @Override
+  public IFieldDefinition getDefinition() {
+    return definition;
+  }
+
+  @NonNull
+  protected FieldReference getBinding() {
+    return binding;
+  }
+
+  @Override
+  public Map<IAttributable.Key, Set<String>> getProperties() {
+    return properties;
+  }
+
+  @Override
+  public IGroupAs getGroupAs() {
+    return groupAs;
+  }
+
+  @Override
+  public IAssemblyNodeItem getNodeItem() {
+    return boundNodeItem.get();
+  }
+
+  // ---------------------------------------
+  // - Start binding driven code - CPD-OFF -
+  // ---------------------------------------
+
   @Override
   public boolean isInXmlWrapped() {
     return ModelSupport.fieldInXml(getBinding().getInXml());
@@ -117,14 +163,12 @@ public MarkupMultiline getRemarks() {
   @Override
   public int getMinOccurs() {
     BigInteger min = getBinding().getMinOccurs();
-    return min == null ? IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS : min.intValueExact();
+    return min == null ? DEFAULT_GROUP_AS_MIN_OCCURS : min.intValueExact();
   }
 
   @Override
   public int getMaxOccurs() {
     String max = getBinding().getMaxOccurs();
-    return max == null
-        ? IGroupable.DEFAULT_GROUP_AS_MIN_OCCURS
-        : ModelSupport.maxOccurs(max);
+    return max == null ? DEFAULT_GROUP_AS_MAX_OCCURS : ModelSupport.maxOccurs(max);
   }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java
index 4f5757c98..afbe1fa99 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java
@@ -29,48 +29,62 @@
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
-import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
 import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped;
+import gov.nist.secauto.metaschema.core.model.IAttributable;
+import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
+import gov.nist.secauto.metaschema.core.model.IChoiceInstance;
 import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
 import gov.nist.secauto.metaschema.core.model.IContainerModelAssemblySupport;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.IFlagInstance;
+import gov.nist.secauto.metaschema.core.model.IModelInstanceAbsolute;
+import gov.nist.secauto.metaschema.core.model.INamedModelInstanceAbsolute;
 import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet;
 import gov.nist.secauto.metaschema.core.model.constraint.IModelConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyGrouped;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelNamedAbsolute;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceGroupBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyConstraints;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyConstraints;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel;
+
+import java.util.Map;
+import java.util.Set;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceModelGroupedAssemblyInline
-    extends AbstractInstanceModelGrouped<AssemblyModel.ChoiceGroup.DefineAssembly>
-    implements IBindingInstanceModelAssemblyGrouped, IBindingDefinitionAssembly,
-    IFeatureDefinitionInstanceInlined<IBindingDefinitionAssembly, IAssemblyInstanceGrouped>,
-    IFeatureBindingContainerModelAssembly,
-    IFeatureBindingContainerFlag {
+    extends AbstractInlineAssemblyDefinition<
+        IChoiceGroupInstance,
+        IAssemblyDefinition,
+        IAssemblyInstanceGrouped,
+        IAssemblyDefinition,
+        IFlagInstance,
+        IModelInstanceAbsolute,
+        INamedModelInstanceAbsolute,
+        IFieldInstanceAbsolute,
+        IAssemblyInstanceAbsolute,
+        IChoiceInstance,
+        IChoiceGroupInstance>
+    implements IAssemblyInstanceGrouped, IFeatureBindingContainerModelAssembly {
+  @NonNull
+  private final AssemblyModel.ChoiceGroup.DefineAssembly binding;
   @NonNull
-  private final Lazy<IContainerFlagSupport<IBindingInstanceFlag>> flagContainer;
+  private final Map<IAttributable.Key, Set<String>> properties;
+  @NonNull
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IContainerModelAssemblySupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute,
-      IInstanceModelChoiceBinding,
-      IInstanceModelChoiceGroupBinding>> modelContainer;
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute,
+      IChoiceInstance,
+      IChoiceGroupInstance>> modelContainer;
   @NonNull
   private final Lazy<IModelConstrained> modelConstraints;
   @NonNull
@@ -80,21 +94,25 @@ public InstanceModelGroupedAssemblyInline(
       @NonNull AssemblyModel.ChoiceGroup.DefineAssembly binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IInstanceModelChoiceGroupBinding parent,
+      @NonNull IChoiceGroupInstance parent,
       @NonNull INodeItemFactory nodeItemFactory) {
-    super(binding, bindingInstance, position, parent, ObjectUtils.requireNonNull(binding.getProps()));
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> FlagContainerSupport.of(
+    super(parent);
+    this.binding = binding;
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> FlagContainerSupport.newFlagContainer(
         binding.getFlags(),
         bindingInstance,
-        this)));
+        this,
+        getParentContainer().getJsonKeyFlagInstanceName())));
     this.modelContainer = ObjectUtils.notNull(Lazy.lazy(() -> AssemblyModelContainerSupport.of(
         binding.getModel(),
-        ObjectUtils.requireNonNull(bindingInstance.getDefinition().getAssemblyInstanceByName("model")),
+        ObjectUtils
+            .requireNonNull(bindingInstance.getDefinition().getAssemblyInstanceByName(MODEL_QNAME)),
         this,
         nodeItemFactory)));
     this.modelConstraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IModelConstrained retval = new AssemblyConstraintSet();
-      AssemblyConstraints constraints = getBinding().getConstraint();
+      AssemblyConstraints constraints = binding.getConstraint();
       if (constraints != null) {
         ConstraintBindingSupport.parse(
             retval,
@@ -104,24 +122,34 @@ public InstanceModelGroupedAssemblyInline(
       return retval;
     }));
     this.boundNodeItem = ObjectUtils.notNull(
-        Lazy.lazy(() -> (IAssemblyNodeItem) getContainingDefinition().getBoundNodeItem()
-            .getModelItemsByName(bindingInstance.getJsonName())
+        Lazy.lazy(() -> (IAssemblyNodeItem) ObjectUtils.notNull(getContainingDefinition().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
             .get(position)));
   }
 
+  @NonNull
+  protected AssemblyModel.ChoiceGroup.DefineAssembly getBinding() {
+    return binding;
+  }
+
   @Override
-  public IContainerFlagSupport<IBindingInstanceFlag> getFlagContainer() {
+  public Map<IAttributable.Key, Set<String>> getProperties() {
+    return properties;
+  }
+
+  @Override
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
     return ObjectUtils.notNull(flagContainer.get());
   }
 
   @Override
   public IContainerModelAssemblySupport<
-      IBindingInstanceModelAbsolute,
-      IBindingInstanceModelNamedAbsolute,
-      IBindingInstanceModelFieldAbsolute,
-      IBindingInstanceModelAssemblyAbsolute,
-      IInstanceModelChoiceBinding,
-      IInstanceModelChoiceGroupBinding> getModelContainer() {
+      IModelInstanceAbsolute,
+      INamedModelInstanceAbsolute,
+      IFieldInstanceAbsolute,
+      IAssemblyInstanceAbsolute,
+      IChoiceInstance,
+      IChoiceGroupInstance> getModelContainer() {
     return ObjectUtils.notNull(modelContainer.get());
   }
 
@@ -130,21 +158,14 @@ public IModelConstrained getConstraintSupport() {
     return ObjectUtils.notNull(modelConstraints.get());
   }
 
-  @SuppressWarnings("null")
   @Override
-  public INodeItem getBoundNodeItem() {
+  public IAssemblyNodeItem getNodeItem() {
     return boundNodeItem.get();
   }
 
-  @Override
-  public IBindingDefinitionAssembly getDefinition() {
-    return this;
-  }
-
-  @Override
-  public IAssemblyInstanceGrouped getInlineInstance() {
-    return this;
-  }
+  // ---------------------------------------
+  // - Start binding driven code - CPD-OFF -
+  // ---------------------------------------
 
   @Override
   public String getName() {
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java
index 44f70a156..913fd9883 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java
@@ -28,43 +28,83 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
+import gov.nist.secauto.metaschema.core.model.AbstractAssemblyInstance;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyInstanceGrouped;
+import gov.nist.secauto.metaschema.core.model.IAttributable;
+import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelAssemblyGrouped;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceGroupBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel;
+
+import java.util.Map;
+import java.util.Set;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceModelGroupedAssemblyReference
-    extends AbstractInstanceModelGrouped<AssemblyModel.ChoiceGroup.Assembly>
-    implements IBindingInstanceModelAssemblyGrouped,
-    IFeatureDefinitionReferenceInstance<IBindingDefinitionAssembly, IBindingInstanceModelAssemblyGrouped> {
+    extends AbstractAssemblyInstance<
+        IChoiceGroupInstance,
+        IAssemblyDefinition,
+        IAssemblyInstanceGrouped,
+        IAssemblyDefinition>
+    implements IAssemblyInstanceGrouped {
+  @NonNull
+  private final AssemblyModel.ChoiceGroup.Assembly binding;
+  @NonNull
+  private final IAssemblyDefinition definition;
+  @NonNull
+  private final Map<IAttributable.Key, Set<String>> properties;
   @NonNull
-  private final IBindingDefinitionAssembly definition;
+  private final Lazy<IAssemblyNodeItem> boundNodeItem;
 
   public InstanceModelGroupedAssemblyReference(
       @NonNull AssemblyModel.ChoiceGroup.Assembly binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingDefinitionAssembly definition,
-      @NonNull IInstanceModelChoiceGroupBinding parent) {
-    super(binding, bindingInstance, position, parent, ObjectUtils.requireNonNull(binding.getProps()));
+      @NonNull IAssemblyDefinition definition,
+      @NonNull IChoiceGroupInstance parent) {
+    super(parent);
+    this.binding = binding;
     this.definition = definition;
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.boundNodeItem = ObjectUtils.notNull(
+        Lazy.lazy(() -> (IAssemblyNodeItem) ObjectUtils.notNull(getContainingDefinition().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
+            .get(position)));
   }
 
   @Override
-  public IBindingDefinitionAssembly getDefinition() {
+  public IAssemblyDefinition getDefinition() {
     return definition;
   }
 
+  @NonNull
+  protected AssemblyModel.ChoiceGroup.Assembly getBinding() {
+    return binding;
+  }
+
+  @Override
+  public Map<IAttributable.Key, Set<String>> getProperties() {
+    return properties;
+  }
+
+  @Override
+  public IAssemblyNodeItem getNodeItem() {
+    return boundNodeItem.get();
+  }
+
   @Override
   public String getName() {
     return getDefinition().getName();
   }
 
+  // ---------------------------------------
+  // - Start binding driven code - CPD-OFF -
+  // ---------------------------------------
+
   @Override
   public String getUseName() {
     return ModelSupport.useName(getBinding().getUseName());
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java
index 13cf83d7e..65a3e235c 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java
@@ -29,8 +29,13 @@
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IFieldNodeItem;
+import gov.nist.secauto.metaschema.core.model.AbstractInlineFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAttributable;
+import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
 import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionInstanceInlined;
+import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
 import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
 import gov.nist.secauto.metaschema.core.model.constraint.ISource;
@@ -38,47 +43,60 @@
 import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelField;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceFlag;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldGrouped;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceGroupBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.FieldConstraints;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.FieldConstraints;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.JsonValueKeyFlag;
+
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceModelGroupedFieldInline
-    extends AbstractInstanceModelGrouped<AssemblyModel.ChoiceGroup.DefineField>
-    implements IBindingInstanceModelFieldGrouped, IBindingDefinitionModelField,
-    IFeatureDefinitionInstanceInlined<IBindingDefinitionModelField, IFieldInstanceGrouped>,
-    IFeatureBindingContainerFlag {
+    extends AbstractInlineFieldDefinition<
+        IChoiceGroupInstance,
+        IFieldDefinition,
+        IFieldInstanceGrouped,
+        IAssemblyDefinition,
+        IFlagInstance>
+    implements IFieldInstanceGrouped {
+  @NonNull
+  private final AssemblyModel.ChoiceGroup.DefineField binding;
+  @NonNull
+  private final Map<IAttributable.Key, Set<String>> properties;
   @NonNull
   private final IDataTypeAdapter<?> javaTypeAdapter;
   @Nullable
   private final Object defaultValue;
   @NonNull
-  private final Lazy<IContainerFlagSupport<IBindingInstanceFlag>> flagContainer;
+  private final Lazy<IContainerFlagSupport<IFlagInstance>> flagContainer;
   @NonNull
   private final Lazy<IValueConstrained> valueConstraints;
+  @NonNull
+  private final Lazy<IFieldNodeItem> boundNodeItem;
 
   public InstanceModelGroupedFieldInline(
       @NonNull AssemblyModel.ChoiceGroup.DefineField binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IInstanceModelChoiceGroupBinding parent) {
-    super(binding, bindingInstance, position, parent, ObjectUtils.requireNonNull(binding.getProps()));
-    this.javaTypeAdapter = ModelSupport.dataType(getBinding().getAsType());
-    this.defaultValue = ModelSupport.defaultValue(getBinding().getDefault(), this.javaTypeAdapter);
-    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> FlagContainerSupport.of(
+      @NonNull IChoiceGroupInstance parent) {
+    super(parent);
+    this.binding = binding;
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.javaTypeAdapter = ModelSupport.dataType(binding.getAsType());
+    this.defaultValue = ModelSupport.defaultValue(binding.getDefault(), this.javaTypeAdapter);
+    this.flagContainer = ObjectUtils.notNull(Lazy.lazy(() -> FlagContainerSupport.newFlagContainer(
         binding.getFlags(),
         bindingInstance,
-        this)));
+        this,
+        getParentContainer().getJsonKeyFlagInstanceName())));
     this.valueConstraints = ObjectUtils.notNull(Lazy.lazy(() -> {
       IValueConstrained retval = new ValueConstraintSet();
-      FieldConstraints constraints = getBinding().getConstraint();
+      FieldConstraints constraints = binding.getConstraint();
       if (constraints != null) {
         ConstraintBindingSupport.parse(
             retval,
@@ -87,31 +105,40 @@ public InstanceModelGroupedFieldInline(
       }
       return retval;
     }));
+    this.boundNodeItem = ObjectUtils.notNull(
+        Lazy.lazy(() -> (IFieldNodeItem) ObjectUtils.notNull(getContainingDefinition().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
+            .get(position)));
+  }
+
+  @NonNull
+  protected AssemblyModel.ChoiceGroup.DefineField getBinding() {
+    return binding;
   }
 
   @Override
-  public IContainerFlagSupport<IBindingInstanceFlag> getFlagContainer() {
-    return ObjectUtils.notNull(flagContainer.get());
+  public Map<IAttributable.Key, Set<String>> getProperties() {
+    return properties;
   }
 
   @Override
-  public IValueConstrained getConstraintSupport() {
-    return ObjectUtils.notNull(valueConstraints.get());
+  public IContainerFlagSupport<IFlagInstance> getFlagContainer() {
+    return ObjectUtils.notNull(flagContainer.get());
   }
 
   @Override
-  public IDataTypeAdapter<?> getJavaTypeAdapter() {
-    return javaTypeAdapter;
+  public IValueConstrained getConstraintSupport() {
+    return ObjectUtils.notNull(valueConstraints.get());
   }
 
   @Override
-  public IBindingDefinitionModelField getDefinition() {
-    return this;
+  public IFieldNodeItem getNodeItem() {
+    return boundNodeItem.get();
   }
 
   @Override
-  public IFieldInstanceGrouped getInlineInstance() {
-    return this;
+  public IDataTypeAdapter<?> getJavaTypeAdapter() {
+    return javaTypeAdapter;
   }
 
   @Override
@@ -119,6 +146,10 @@ public Object getDefaultValue() {
     return defaultValue;
   }
 
+  // ---------------------------------------
+  // - Start binding driven code - CPD-OFF -
+  // ---------------------------------------
+
   @Override
   public String getName() {
     return ObjectUtils.notNull(getBinding().getName());
@@ -153,7 +184,7 @@ public String getDiscriminatorValue() {
   public IFlagInstance getJsonValueKeyFlagInstance() {
     JsonValueKeyFlag obj = getBinding().getJsonValueKeyFlag();
     String flagName = obj == null ? null : obj.getFlagRef();
-    return flagName == null ? null : getFlagInstanceByName(flagName);
+    return flagName == null ? null : getFlagInstanceByName(new QName(getXmlNamespace(), flagName));
   }
 
   @Override
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java
index 5ab347f65..cb21aaa38 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java
@@ -28,43 +28,84 @@
 
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
-import gov.nist.secauto.metaschema.core.model.IFeatureDefinitionReferenceInstance;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
+import gov.nist.secauto.metaschema.core.model.AbstractFieldInstance;
+import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.core.model.IAttributable;
+import gov.nist.secauto.metaschema.core.model.IChoiceGroupInstance;
+import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
+import gov.nist.secauto.metaschema.core.model.IFieldInstanceGrouped;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceModelGroupedAssembly;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingDefinitionModelField;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingInstanceModelFieldGrouped;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IInstanceModelChoiceGroupBinding;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.AssemblyModel;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.AssemblyModel;
+
+import java.util.Map;
+import java.util.Set;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import nl.talsmasoftware.lazy4j.Lazy;
 
 public class InstanceModelGroupedFieldReference
-    extends AbstractInstanceModelGrouped<AssemblyModel.ChoiceGroup.Field>
-    implements IBindingInstanceModelFieldGrouped,
-    IFeatureDefinitionReferenceInstance<IBindingDefinitionModelField, IBindingInstanceModelFieldGrouped> {
+    extends AbstractFieldInstance<
+        IChoiceGroupInstance,
+        IFieldDefinition,
+        IFieldInstanceGrouped,
+        IAssemblyDefinition>
+    implements IFieldInstanceGrouped {
+  @NonNull
+  private final AssemblyModel.ChoiceGroup.Field binding;
+  @NonNull
+  private final IFieldDefinition definition;
+  @NonNull
+  private final Map<IAttributable.Key, Set<String>> properties;
   @NonNull
-  private final IBindingDefinitionModelField definition;
+  private final Lazy<IAssemblyNodeItem> boundNodeItem;
 
   protected InstanceModelGroupedFieldReference(
       @NonNull AssemblyModel.ChoiceGroup.Field binding,
       @NonNull IBoundInstanceModelGroupedAssembly bindingInstance,
       int position,
-      @NonNull IBindingDefinitionModelField definition,
-      @NonNull IInstanceModelChoiceGroupBinding parent) {
-    super(binding, bindingInstance, position, parent, ObjectUtils.requireNonNull(binding.getProps()));
+      @NonNull IFieldDefinition definition,
+      @NonNull IChoiceGroupInstance parent) {
+    super(parent);
+    this.binding = binding;
     this.definition = definition;
+    this.properties = ModelSupport.parseProperties(ObjectUtils.requireNonNull(binding.getProps()));
+    this.boundNodeItem = ObjectUtils.notNull(
+        Lazy.lazy(() -> (IAssemblyNodeItem) ObjectUtils.notNull(getContainingDefinition().getNodeItem())
+            .getModelItemsByName(bindingInstance.getXmlQName())
+            .get(position)));
   }
 
   @Override
-  public IBindingDefinitionModelField getDefinition() {
+  public IFieldDefinition getDefinition() {
     return definition;
   }
 
+  @NonNull
+  protected AssemblyModel.ChoiceGroup.Field getBinding() {
+    return binding;
+  }
+
+  @Override
+  public Map<IAttributable.Key, Set<String>> getProperties() {
+    return properties;
+  }
+
+  @Override
+  public IAssemblyNodeItem getNodeItem() {
+    return boundNodeItem.get();
+  }
+
   @Override
   public String getName() {
     return getDefinition().getName();
   }
 
+  // ---------------------------------------
+  // - Start binding driven code - CPD-OFF -
+  // ---------------------------------------
+
   @Override
   public String getUseName() {
     return ModelSupport.useName(getBinding().getUseName());
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ModelSupport.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ModelSupport.java
index b927dcb98..3e1560ae6 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ModelSupport.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/impl/ModelSupport.java
@@ -30,9 +30,12 @@
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
+import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IFieldInstance;
 import gov.nist.secauto.metaschema.core.model.IGroupable;
+import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.ModuleScopeEnum;
 import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior;
@@ -40,11 +43,11 @@
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.IGroupAs;
 import gov.nist.secauto.metaschema.databind.model.annotations.ModelUtil;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.GroupAs;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA.DefineAssembly.RootName;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Property;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.Remarks;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.UseName;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.GroupingAs;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.METASCHEMA.DefineAssembly.RootName;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.Property;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.Remarks;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.UseName;
 
 import java.math.BigInteger;
 import java.net.URI;
@@ -54,6 +57,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.xml.namespace.QName;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
@@ -67,14 +72,14 @@ public static Map<IAttributable.Key, Set<String>> parseProperties(@NonNull List<
     return CollectionUtil.unmodifiableMap(ObjectUtils.notNull(props.stream()
         .collect(
             Collectors.groupingBy(
-                (prop) -> {
+                prop -> {
                   String name = ObjectUtils.requireNonNull(prop.getName());
                   URI namespace = prop.getNamespace();
                   return namespace == null ? IAttributable.key(name)
                       : IAttributable.key(name, ObjectUtils.notNull(namespace.toASCIIString()));
                 },
                 Collectors.mapping(
-                    (prop) -> ObjectUtils.requireNonNull(prop.getValue()),
+                    prop -> ObjectUtils.requireNonNull(prop.getValue()),
                     Collectors.toCollection(LinkedHashSet::new))))));
   }
 
@@ -181,10 +186,12 @@ public static boolean fieldInXml(@Nullable String inXml) {
   }
 
   @NonNull
-  public static IGroupAs groupAs(@Nullable GroupAs groupAs) {
+  public static IGroupAs groupAs(
+      @Nullable GroupingAs groupAs,
+      @NonNull IModule module) {
     return groupAs == null
         ? IGroupAs.SINGLETON_GROUP_AS
-        : new GroupAsImpl(groupAs);
+        : new GroupAsImpl(groupAs, module);
   }
 
   @NonNull
@@ -227,4 +234,14 @@ public static XmlGroupAsBehavior groupAsXmlBehavior(@Nullable String inXml) {
     }
     return retval;
   }
+
+  @SuppressWarnings("unchecked")
+  @Nullable
+  public static <NODE extends IAssemblyNodeItem> NODE toNodeItem(
+      @NonNull IModule module,
+      @NonNull QName qname,
+      int position) {
+    IDocumentNodeItem moduleNodeItem = module.getNodeItem();
+    return moduleNodeItem == null ? null : (NODE) moduleNodeItem.getModelItemsByName(qname).get(position);
+  }
 }
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModelField.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/package-info.java
similarity index 87%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModelField.java
rename to databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/package-info.java
index cc9ce7433..657e9849d 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionModelField.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/package-info.java
@@ -24,10 +24,11 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema;
-
-import gov.nist.secauto.metaschema.core.model.IFieldDefinition;
+/**
+ * Provides an implementation of the Module model
+ * ({@link gov.nist.secauto.metaschema.core.model}) represented by a
+ * module-specific set of bound Java classes
+ * ({@link gov.nist.secauto.metaschema.databind.model.binding.metaschema}).
+ */
 
-public interface IBindingDefinitionModelField extends IFieldDefinition, IBindingDefinitionModel {
-  // no additional methods
-}
+package gov.nist.secauto.metaschema.databind.model.metaschema;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/package-info.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/package-info.java
index 4cabc3660..b92bac6ff 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/package-info.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/package-info.java
@@ -26,9 +26,9 @@
 
 /**
  * Provides an overlay of the Metaschema module model
- * ({@link gov.nist.secauto.metaschema.core.model}) representing module
- * constructs as bound Java class annotations
- * ({@link gov.nist.secauto.metaschema.databind.model.annotations}).
+ * ({@link gov.nist.secauto.metaschema.core.model}) using bound Java class
+ * annotations ({@link gov.nist.secauto.metaschema.databind.model.annotations})
+ * to represent module constructs annotated on Java classes.
  */
 
 package gov.nist.secauto.metaschema.databind.model;
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/package-info.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/package-info.java
index 64de47654..63bab10ac 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/package-info.java
+++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/package-info.java
@@ -24,7 +24,22 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 /**
- * The core implementation of the metaschema binding framework.
+ * Support for parsing Metaschema module-based data using Java class bindings.
+ * <p>
+ * Two methods are supported
+ * <ol>
+ * <li>A Java annotation based approach
+ * ({@link gov.nist.secauto.metaschema.databind.model}) using annotations
+ * ({@link gov.nist.secauto.metaschema.databind.model.annotations}). The
+ * {@link gov.nist.secauto.metaschema.databind.DefaultBindingContext} is used to
+ * load a bound Java class.</li>
+ * <li>A metaschema-specific binding, based on the first method, that is capable
+ * of representing a Metaschema module
+ * ({@link gov.nist.secauto.metaschema.databind.model.binding.metaschema}). The
+ * {@link gov.nist.secauto.metaschema.databind.model.metaschema.BindingConstraintLoader}
+ * can be used to load any Metaschema module using this method. Once loaded, the
+ * module can be registered with the binding context.
+ * </ol>
  */
 
 package gov.nist.secauto.metaschema.databind;
diff --git a/databind/src/main/java/module-info.java b/databind/src/main/java/module-info.java
index 9560b6fa2..606eb1ba0 100644
--- a/databind/src/main/java/module-info.java
+++ b/databind/src/main/java/module-info.java
@@ -43,6 +43,7 @@
 
   requires flexmark.util.sequence;
   requires transitive com.google.auto.service;
+  requires org.eclipse.jdt.annotation;
 
   exports gov.nist.secauto.metaschema.databind;
   exports gov.nist.secauto.metaschema.databind.codegen;
@@ -56,7 +57,7 @@
   exports gov.nist.secauto.metaschema.databind.model.info;
   exports gov.nist.secauto.metaschema.databind.model.annotations;
   exports gov.nist.secauto.metaschema.databind.model.metaschema;
-  exports gov.nist.secauto.metaschema.databind.model.metaschema.binding;
+  exports gov.nist.secauto.metaschema.databind.model.binding.metaschema;
 
   // need to allow access to the generated XMLBeans files
   opens org.apache.xmlbeans.metadata.system.metaschema.codegen;
diff --git a/databind/src/main/resources/META-INF/services/javax.xml.bind.JAXBContext b/databind/src/main/resources/META-INF/services/javax.xml.bind.JAXBContext
index 1d8f4c3ef..7c4d3a15f 100644
--- a/databind/src/main/resources/META-INF/services/javax.xml.bind.JAXBContext
+++ b/databind/src/main/resources/META-INF/services/javax.xml.bind.JAXBContext
@@ -1 +1 @@
-org.eclipse.persistence.jaxb.JAXBContextFactory 
\ No newline at end of file
+org.eclipse.persistence.jaxb.JAXBContextFactory
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/DefaultBindingContextTest.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/DefaultBindingContextTest.java
index 431600079..66d952708 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/DefaultBindingContextTest.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/DefaultBindingContextTest.java
@@ -48,6 +48,8 @@
 import java.nio.file.Paths;
 import java.util.List;
 
+import javax.xml.namespace.QName;
+
 class DefaultBindingContextTest {
 
   @Test
@@ -61,7 +63,8 @@ void testConstraints() throws MetaschemaException, IOException { // NOPMD - inte
     IBindingContext bindingContext = new DefaultBindingContext(CollectionUtil.singletonList(postProcessor));
     IBoundModule module = bindingContext.registerModule(TestMetaschema.class);
 
-    IAssemblyDefinition root = module.getExportedAssemblyDefinitionByName("root");
+    IAssemblyDefinition root
+        = module.getExportedAssemblyDefinitionByName(new QName("https://csrc.nist.gov/ns/test/xml", "root"));
 
     assertNotNull(root, "root not found");
     List<? extends IConstraint> constraints = root.getConstraints();
@@ -79,7 +82,8 @@ void testConstraintsUsingBinding() throws MetaschemaException, IOException { //
     IBindingContext bindingContext = new DefaultBindingContext(CollectionUtil.singletonList(postProcessor));
     IBoundModule module = bindingContext.registerModule(TestMetaschema.class);
 
-    IAssemblyDefinition root = module.getExportedAssemblyDefinitionByName("root");
+    IAssemblyDefinition root
+        = module.getExportedAssemblyDefinitionByName(new QName("https://csrc.nist.gov/ns/test/xml", "root"));
 
     assertNotNull(root, "root not found");
     List<? extends IConstraint> constraints = root.getConstraints();
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/AbstractMetaschemaTest.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/AbstractMetaschemaTest.java
index c83c80fa9..3131d6a03 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/AbstractMetaschemaTest.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/AbstractMetaschemaTest.java
@@ -28,6 +28,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertAll;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.DefaultBindingContext;
@@ -37,7 +39,6 @@
 import gov.nist.secauto.metaschema.databind.io.Format;
 import gov.nist.secauto.metaschema.databind.io.IDeserializer;
 import gov.nist.secauto.metaschema.databind.model.metaschema.BindingModuleLoader;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -62,14 +63,15 @@ abstract class AbstractMetaschemaTest {
   Path generationDir = ObjectUtils.notNull(Paths.get("target/generated-test-sources/metaschema"));
 
   @NonNull
-  private static IBindingModule loadModule(@NonNull Path moduleFile) throws MetaschemaException, IOException {
+  private static IMetaschemaModule loadModule(@NonNull Path moduleFile) throws MetaschemaException, IOException {
     return LOADER.load(moduleFile);
   }
 
-  public static Class<?> compileModule(@NonNull Path moduleFile, @Nullable Path bindingFile,
+  @NonNull
+  public static Class<? extends IBoundObject> compileModule(@NonNull Path moduleFile, @Nullable Path bindingFile,
       @NonNull String rootClassName, @NonNull Path classDir)
       throws IOException, ClassNotFoundException, MetaschemaException {
-    IBindingModule module = loadModule(moduleFile);
+    IMetaschemaModule module = loadModule(moduleFile);
 
     DefaultBindingConfiguration bindingConfiguration = new DefaultBindingConfiguration();
     if (bindingFile != null && Files.exists(bindingFile) && Files.isRegularFile(bindingFile)) {
@@ -79,30 +81,29 @@ public static Class<?> compileModule(@NonNull Path moduleFile, @Nullable Path bi
     ModuleCompilerHelper.compileModule(module, classDir, bindingConfiguration);
 
     // Load classes
-    return ModuleCompilerHelper.newClassLoader(
+    return ObjectUtils.asType(ObjectUtils.notNull(ModuleCompilerHelper.newClassLoader(
         classDir,
         ObjectUtils.notNull(Thread.currentThread().getContextClassLoader()))
-        .loadClass(rootClassName);
+        .loadClass(rootClassName)));
   }
 
-  private static Object read(
+  private static <T extends IBoundObject> T read(
       @NonNull Format format,
       @NonNull Path file,
-      @NonNull Class<?> rootClass,
+      @NonNull Class<T> rootClass,
       @NonNull IBindingContext context)
       throws IOException {
-    IDeserializer<?> deserializer = context.newDeserializer(format, rootClass);
+    IDeserializer<T> deserializer = context.newDeserializer(format, rootClass);
     LOGGER.info("Reading content: {}", file);
-    Object value = deserializer.deserialize(file);
-    return value;
+    return deserializer.deserialize(file);
   }
 
-  private static <CLASS> void write(
+  private static <T extends IBoundObject> void write(
       @NonNull Format format,
       @NonNull Path file,
-      @NonNull CLASS rootObject,
+      @NonNull T rootObject,
       @NonNull IBindingContext context) throws IOException {
-    @SuppressWarnings("unchecked") Class<CLASS> clazz = (Class<CLASS>) rootObject.getClass();
+    @SuppressWarnings("unchecked") Class<T> clazz = (Class<T>) rootObject.getClass();
 
     try (Writer writer = Files.newBufferedWriter(file, StandardOpenOption.CREATE, StandardOpenOption.WRITE,
         StandardOpenOption.TRUNCATE_EXISTING)) {
@@ -142,12 +143,20 @@ public static void runTests(
       java.util.function.Consumer<Object> assertions)
       throws ClassNotFoundException, IOException, MetaschemaException, BindingException {
 
-    Class<?> rootClass = compileModule(
+    Class<? extends IBoundObject> rootClass = compileModule(
         metaschemaPath,
         bindingPath,
         rootClassName,
         classDir);
-    assert rootClass != null;
+    runTests(examplePath, rootClass, assertions);
+  }
+
+  @SuppressWarnings("unused")
+  public static <T extends IBoundObject> void runTests(
+      @Nullable Path examplePath,
+      @NonNull Class<? extends T> rootClass,
+      java.util.function.Consumer<Object> assertions)
+      throws ClassNotFoundException, IOException, MetaschemaException, BindingException {
 
     if (examplePath != null && Files.exists(examplePath)) {
       IBindingContext context = new DefaultBindingContext();
@@ -157,7 +166,7 @@ public static void runTests(
       String xml;
       {
 
-        Object root = read(Format.XML, examplePath, rootClass, context);
+        T root = read(Format.XML, examplePath, rootClass, context);
         if (LOGGER.isDebugEnabled()) {
           LOGGER.atDebug().log("Read XML: Object: {}", root.toString());
         }
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/BasicMetaschemaTest.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/BasicMetaschemaTest.java
index a3fa4f16d..9254cd6bd 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/BasicMetaschemaTest.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/BasicMetaschemaTest.java
@@ -1,185 +1,185 @@
-/*
- * Portions of this software was developed by employees of the National Institute
- * of Standards and Technology (NIST), an agency of the Federal Government and is
- * being made available as a public service. Pursuant to title 17 United States
- * Code Section 105, works of NIST employees are not subject to copyright
- * protection in the United States. This software may be subject to foreign
- * copyright. Permission in the United States and in foreign countries, to the
- * extent that NIST may hold copyright, to use, copy, modify, create derivative
- * works, and distribute this software and its documentation without fee is hereby
- * granted on a non-exclusive basis, provided that this notice and disclaimer
- * of warranty appears in all copies.
- *
- * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
- * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
- * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
- * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
- * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
- * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
- * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
- * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
- * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
- * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
- */
-
-package gov.nist.secauto.metaschema.databind.codegen;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import gov.nist.secauto.metaschema.core.model.MetaschemaException;
-import gov.nist.secauto.metaschema.core.util.ObjectUtils;
-import gov.nist.secauto.metaschema.databind.io.BindingException;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.platform.commons.util.ReflectionUtils;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-class BasicMetaschemaTest
-    extends AbstractMetaschemaTest {
-
-  @Test
-  void testSimpleMetaschema() throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
-    runTests("simple", "gov.nist.csrc.ns.metaschema.testing.simple.TopLevel", ObjectUtils.notNull(generationDir));
-    // runTests("simple", "gov.nist.csrc.ns.metaschema.testing.simple.TopLevel",
-    // generationDir, (obj) ->
-    // {
-    // try {
-    // Assertions.assertEquals("test", reflectMethod(obj, "getId"));
-    // } catch (NoSuchMethodException | SecurityException e) {
-    // Assertions.fail(e);
-    // }
-    // });
-  }
-
-  @Test
-  void testSimpleUuidMetaschema()
-      throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
-    runTests(
-        "simple_with_uuid",
-        "gov.nist.csrc.ns.metaschema.testing.simple.with.uuid.TopLevel",
-        ObjectUtils.notNull(generationDir),
-        (obj) -> {
-          try {
-            assertEquals("5de455cf-2f8d-4da2-9182-323d433e1065", reflectMethod(obj, "getUuid").toString());
-          } catch (NoSuchMethodException | SecurityException e) {
-            fail(e);
-          }
-        });
-  }
-
-  @Test
-  void testSimpleWithFieldMetaschema()
-      throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
-    runTests(
-        "simple_with_field",
-        "gov.nist.csrc.ns.metaschema.testing.simple.with.field.TopLevel",
-        ObjectUtils.notNull(generationDir));
-  }
-
-  private static Object reflectMethod(Object obj, String name) throws NoSuchMethodException {
-    return ReflectionUtils.invokeMethod(obj.getClass().getMethod(name), obj);
-  }
-
-  @Test
-  void testFieldsWithFlagMetaschema()
-      throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
-    runTests(
-        "fields_with_flags",
-        "gov.nist.csrc.ns.metaschema.testing.fields.with.flags.TopLevel",
-        ObjectUtils.notNull(generationDir),
-        (obj) -> {
-          try {
-            Assertions.assertEquals("test", reflectMethod(obj, "getId"));
-            Object field1 = ReflectionUtils.invokeMethod(obj.getClass().getMethod("getComplexField1"), obj);
-            Assertions.assertNotNull(field1);
-            Assertions.assertEquals("complex-field1", reflectMethod(field1, "getId"));
-            Assertions.assertEquals("test-string", reflectMethod(field1, "getValue"));
-
-            @SuppressWarnings("unchecked") List<Object> field2s
-                = (List<Object>) ReflectionUtils.invokeMethod(obj.getClass().getMethod("getComplexFields2"),
-                    obj);
-            Assertions.assertNotNull(field2s);
-            Assertions.assertEquals(1, field2s.size());
-            Object field2 = field2s.get(0);
-            Assertions.assertEquals("complex-field2-1", reflectMethod(field2, "getId"));
-            Assertions.assertEquals("test-string2", reflectMethod(field2, "getValue"));
-
-            @SuppressWarnings("unchecked") List<Object> field3s
-                = (List<Object>) ReflectionUtils.invokeMethod(obj.getClass().getMethod("getComplexFields3"),
-                    obj);
-            Assertions.assertEquals(2, field3s.size());
-            Assertions.assertAll("ComplexFields4 item", () -> {
-              Object item = field3s.get(0);
-              assertEquals("complex-field3-1", reflectMethod(item, "getId2"));
-              assertEquals("test-string3", reflectMethod(item, "getValue"));
-            });
-            Assertions.assertAll("ComplexFields4 item", () -> {
-              Object item = field3s.get(1);
-              assertEquals("complex-field3-2", reflectMethod(item, "getId2"));
-              assertEquals("test-string4", reflectMethod(item, "getValue"));
-            });
-
-            Assertions.assertAll("ComplexFields4", () -> {
-              @SuppressWarnings("unchecked") Map<String, Object> collection
-                  = (Map<String, Object>) ReflectionUtils.invokeMethod(obj.getClass().getMethod("getComplexFields4"),
-                      obj);
-              Assertions.assertNotNull(collection);
-              Assertions.assertEquals(2, collection.size());
-              Set<Map.Entry<String, Object>> entries = collection.entrySet();
-              Iterator<Map.Entry<String, Object>> iter = entries.iterator();
-
-              Assertions.assertAll("ComplexFields4 item", () -> {
-                Map.Entry<String, Object> entry = iter.next();
-                assertEquals("complex-field4-1", entry.getKey());
-                assertEquals("complex-field4-1", reflectMethod(entry.getValue(), "getId2"));
-                assertEquals("test-string5", reflectMethod(entry.getValue(), "getValue"));
-              });
-
-              Assertions.assertAll("ComplexFields4 item", () -> {
-                Map.Entry<String, Object> entry = iter.next();
-                assertEquals("complex-field4-2", entry.getKey());
-                assertEquals("complex-field4-2", reflectMethod(entry.getValue(), "getId2"));
-                assertEquals("test-string6", reflectMethod(entry.getValue(), "getValue"));
-              });
-            });
-          } catch (NoSuchMethodException | SecurityException e) {
-            Assertions.fail(e);
-          }
-        });
-  }
-
-  @Test
-  void testAssemblyMetaschema()
-      throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
-    runTests(
-        "assembly",
-        "gov.nist.itl.metaschema.codegen.xml.example.assembly.TopLevel",
-        ObjectUtils.notNull(generationDir),
-        (obj) -> {
-          try {
-            Assertions.assertEquals("test", reflectMethod(obj, "getId"));
-          } catch (NoSuchMethodException | SecurityException e) {
-            Assertions.fail(e);
-          }
-        });
-  }
-
-  @Test
-  void testLocalDefinitionsMetaschema()
-      throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
-    runTests(
-        "local-definitions",
-        "gov.nist.csrc.ns.metaschema.testing.local.definitions.TopLevel",
-        ObjectUtils.notNull(generationDir));
-  }
-
-}
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.databind.codegen;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import gov.nist.secauto.metaschema.core.model.MetaschemaException;
+import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+import gov.nist.secauto.metaschema.databind.io.BindingException;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.commons.util.ReflectionUtils;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+class BasicMetaschemaTest
+    extends AbstractMetaschemaTest {
+
+  @Test
+  void testSimpleMetaschema() throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
+    runTests("simple", "gov.nist.csrc.ns.metaschema.testing.simple.TopLevel", ObjectUtils.notNull(generationDir));
+    // runTests("simple", "gov.nist.csrc.ns.metaschema.testing.simple.TopLevel",
+    // generationDir, (obj) ->
+    // {
+    // try {
+    // Assertions.assertEquals("test", reflectMethod(obj, "getId"));
+    // } catch (NoSuchMethodException | SecurityException e) {
+    // Assertions.fail(e);
+    // }
+    // });
+  }
+
+  @Test
+  void testSimpleUuidMetaschema()
+      throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
+    runTests(
+        "simple_with_uuid",
+        "gov.nist.csrc.ns.metaschema.testing.simple.with.uuid.TopLevel",
+        ObjectUtils.notNull(generationDir),
+        (obj) -> {
+          try {
+            assertEquals("5de455cf-2f8d-4da2-9182-323d433e1065", reflectMethod(obj, "getUuid").toString());
+          } catch (NoSuchMethodException | SecurityException e) {
+            fail(e);
+          }
+        });
+  }
+
+  @Test
+  void testSimpleWithFieldMetaschema()
+      throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
+    runTests(
+        "simple_with_field",
+        "gov.nist.csrc.ns.metaschema.testing.simple.with.field.TopLevel",
+        ObjectUtils.notNull(generationDir));
+  }
+
+  private static Object reflectMethod(Object obj, String name) throws NoSuchMethodException {
+    return ReflectionUtils.invokeMethod(obj.getClass().getMethod(name), obj);
+  }
+
+  @Test
+  void testFieldsWithFlagMetaschema()
+      throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
+    runTests(
+        "fields_with_flags",
+        "gov.nist.csrc.ns.metaschema.testing.fields.with.flags.TopLevel",
+        ObjectUtils.notNull(generationDir),
+        (obj) -> {
+          try {
+            Assertions.assertEquals("test", reflectMethod(obj, "getId"));
+            Object field1 = ReflectionUtils.invokeMethod(obj.getClass().getMethod("getComplexField1"), obj);
+            Assertions.assertNotNull(field1);
+            Assertions.assertEquals("complex-field1", reflectMethod(field1, "getId"));
+            Assertions.assertEquals("test-string", reflectMethod(field1, "getValue"));
+
+            @SuppressWarnings("unchecked") List<Object> field2s
+                = (List<Object>) ReflectionUtils.invokeMethod(obj.getClass().getMethod("getComplexFields2"),
+                    obj);
+            Assertions.assertNotNull(field2s);
+            Assertions.assertEquals(1, field2s.size());
+            Object field2 = field2s.get(0);
+            Assertions.assertEquals("complex-field2-1", reflectMethod(field2, "getId"));
+            Assertions.assertEquals("test-string2", reflectMethod(field2, "getValue"));
+
+            @SuppressWarnings("unchecked") List<Object> field3s
+                = (List<Object>) ReflectionUtils.invokeMethod(obj.getClass().getMethod("getComplexFields3"),
+                    obj);
+            Assertions.assertEquals(2, field3s.size());
+            Assertions.assertAll("ComplexFields4 item", () -> {
+              Object item = field3s.get(0);
+              assertEquals("complex-field3-1", reflectMethod(item, "getId2"));
+              assertEquals("test-string3", reflectMethod(item, "getValue"));
+            });
+            Assertions.assertAll("ComplexFields4 item", () -> {
+              Object item = field3s.get(1);
+              assertEquals("complex-field3-2", reflectMethod(item, "getId2"));
+              assertEquals("test-string4", reflectMethod(item, "getValue"));
+            });
+
+            Assertions.assertAll("ComplexFields4", () -> {
+              @SuppressWarnings("unchecked") Map<String, Object> collection
+                  = (Map<String, Object>) ReflectionUtils.invokeMethod(obj.getClass().getMethod("getComplexFields4"),
+                      obj);
+              Assertions.assertNotNull(collection);
+              Assertions.assertEquals(2, collection.size());
+              Set<Map.Entry<String, Object>> entries = collection.entrySet();
+              Iterator<Map.Entry<String, Object>> iter = entries.iterator();
+
+              Assertions.assertAll("ComplexFields4 item", () -> {
+                Map.Entry<String, Object> entry = iter.next();
+                assertEquals("complex-field4-1", entry.getKey());
+                assertEquals("complex-field4-1", reflectMethod(entry.getValue(), "getId2"));
+                assertEquals("test-string5", reflectMethod(entry.getValue(), "getValue"));
+              });
+
+              Assertions.assertAll("ComplexFields4 item", () -> {
+                Map.Entry<String, Object> entry = iter.next();
+                assertEquals("complex-field4-2", entry.getKey());
+                assertEquals("complex-field4-2", reflectMethod(entry.getValue(), "getId2"));
+                assertEquals("test-string6", reflectMethod(entry.getValue(), "getValue"));
+              });
+            });
+          } catch (NoSuchMethodException | SecurityException e) {
+            Assertions.fail(e);
+          }
+        });
+  }
+
+  @Test
+  void testAssemblyMetaschema()
+      throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
+    runTests(
+        "assembly",
+        "gov.nist.itl.metaschema.codegen.xml.example.assembly.TopLevel",
+        ObjectUtils.notNull(generationDir),
+        (obj) -> {
+          try {
+            Assertions.assertEquals("test", reflectMethod(obj, "getId"));
+          } catch (NoSuchMethodException | SecurityException e) {
+            Assertions.fail(e);
+          }
+        });
+  }
+
+  @Test
+  void testLocalDefinitionsMetaschema()
+      throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
+    runTests(
+        "local-definitions",
+        "gov.nist.csrc.ns.metaschema.testing.local.definitions.TopLevel",
+        ObjectUtils.notNull(generationDir));
+  }
+
+}
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/GenerationTest.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/GenerationTest.java
index a46737557..13b42fb2b 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/GenerationTest.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/GenerationTest.java
@@ -29,12 +29,12 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.io.DeserializationFeature;
 import gov.nist.secauto.metaschema.databind.model.metaschema.BindingModuleLoader;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
 
 import org.junit.jupiter.api.Test;
 
@@ -48,7 +48,7 @@ public class GenerationTest {
   void testOscalBindingModuleLoader() throws MetaschemaException, IOException {
     BindingModuleLoader loader = new BindingModuleLoader();
     loader.set(DeserializationFeature.DESERIALIZE_XML_ALLOW_ENTITY_RESOLUTION, true);
-    IBindingModule module = loader.load(ObjectUtils.notNull(URI.create(
+    IMetaschemaModule module = loader.load(ObjectUtils.notNull(URI.create(
         "https://raw.githubusercontent.com/usnistgov/OSCAL/main/src/metaschema/oscal_complete_metaschema.xml")));
     IBindingContext context = IBindingContext.instance().registerModule(module, Paths.get("target/oscal-classes"));
     assertAll(
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/MetaschemaModuleMetaschemaTest.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/MetaschemaModuleMetaschemaTest.java
index ba661572e..8555c92f0 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/MetaschemaModuleMetaschemaTest.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/codegen/MetaschemaModuleMetaschemaTest.java
@@ -28,8 +28,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
-import gov.nist.secauto.metaschema.core.model.xml.IXmlModule;
 import gov.nist.secauto.metaschema.core.model.xml.ModuleLoader;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
@@ -38,10 +38,10 @@
 import gov.nist.secauto.metaschema.databind.io.Format;
 import gov.nist.secauto.metaschema.databind.io.IDeserializer;
 import gov.nist.secauto.metaschema.databind.io.ISerializer;
+import gov.nist.secauto.metaschema.databind.model.binding.metaschema.METASCHEMA;
 import gov.nist.secauto.metaschema.databind.model.metaschema.BindingModuleLoader;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
-import gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -58,18 +58,20 @@ class MetaschemaModuleMetaschemaTest
       = ObjectUtils.notNull(Paths.get("../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml"));
 
   @Test
+  @Disabled
   void testMetaschemaMetaschema() throws MetaschemaException, IOException, ClassNotFoundException, BindingException {
     runTests(
         ObjectUtils.notNull(METASCHEMA_FILE),
         ObjectUtils.notNull(
             Paths.get("../databind-metaschema/src/main/metaschema-bindings/metaschema-metaschema-bindings.xml")),
         null,
-        "gov.nist.secauto.metaschema.databind.model.metaschema.binding.METASCHEMA",
+        ObjectUtils.notNull(METASCHEMA.class.getName()),
         ObjectUtils.notNull(generationDir),
         null);
   }
 
   @Test
+  @Disabled
   void testReadMetaschemaAsXml() throws IOException {
     IBindingContext context = IBindingContext.instance();
 
@@ -112,7 +114,7 @@ void testReadMetaschemaAsXml() throws IOException {
   @Test
   void testModuleLoader() throws MetaschemaException, IOException {
     BindingModuleLoader loader = new BindingModuleLoader();
-    IBindingModule module = loader.load(METASCHEMA_FILE);
+    IMetaschemaModule module = loader.load(METASCHEMA_FILE);
     assertNotNull(module);
   }
 
@@ -120,7 +122,7 @@ void testModuleLoader() throws MetaschemaException, IOException {
   void testOscalBindingModuleLoader() throws MetaschemaException, IOException {
     BindingModuleLoader loader = new BindingModuleLoader();
     loader.set(DeserializationFeature.DESERIALIZE_XML_ALLOW_ENTITY_RESOLUTION, true);
-    IBindingModule module = loader.load(ObjectUtils.notNull(URI.create(
+    IMetaschemaModule module = loader.load(ObjectUtils.notNull(URI.create(
         "https://raw.githubusercontent.com/usnistgov/OSCAL/main/src/metaschema/oscal_complete_metaschema.xml")));
     assertNotNull(module);
   }
@@ -130,7 +132,7 @@ void testOscalXmlModuleLoader() throws MetaschemaException, IOException {
     ModuleLoader loader = new ModuleLoader();
     // loader.set(DeserializationFeature.DESERIALIZE_XML_ALLOW_ENTITY_RESOLUTION,
     // true);
-    IXmlModule module = loader.load(ObjectUtils.notNull(URI.create(
+    IMetaschemaModule module = loader.load(ObjectUtils.notNull(URI.create(
         "https://raw.githubusercontent.com/usnistgov/OSCAL/main/src/metaschema/oscal_complete_metaschema.xml")));
     assertNotNull(module);
   }
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/json/JsonParserTest.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/json/JsonParserTest.java
index 74687c984..12a42a603 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/json/JsonParserTest.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/json/JsonParserTest.java
@@ -28,20 +28,17 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
-import gov.nist.secauto.metaschema.core.model.xml.IXmlModule;
 import gov.nist.secauto.metaschema.core.model.xml.ModuleLoader;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.io.DeserializationFeature;
 import gov.nist.secauto.metaschema.databind.io.IBoundLoader;
 import gov.nist.secauto.metaschema.databind.model.AbstractBoundModelTestSupport;
-import gov.nist.secauto.metaschema.databind.model.metaschema.BindingModuleLoader;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
 
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
-import java.net.URI;
 import java.nio.file.Paths;
 
 class JsonParserTest
@@ -49,7 +46,7 @@ class JsonParserTest
   @Test
   void testIssue308Regression() throws IOException, MetaschemaException {
     ModuleLoader moduleLoader = new ModuleLoader();
-    IXmlModule module
+    IMetaschemaModule module
         = moduleLoader.load(Paths.get("src/test/resources/metaschema/308-choice-regression/metaschema.xml"));
 
     IBindingContext context = IBindingContext.instance();
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/xml/XmlParserTest.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/xml/XmlParserTest.java
index 2cd34e486..d3ca37108 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/xml/XmlParserTest.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/io/xml/XmlParserTest.java
@@ -50,6 +50,7 @@
 import java.io.StringReader;
 import java.util.Collections;
 
+import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
@@ -60,6 +61,8 @@
 
 class XmlParserTest
     extends AbstractBoundModelTestSupport {
+  private static final String NS = "https://csrc.nist.gov/ns/test/xml";
+
   @Test
   void testXmlRead() throws IOException, XMLStreamException {
     String xml = "<test xmlns='https://csrc.nist.gov/ns/test/xml'>"
@@ -86,9 +89,11 @@ void testXmlRead() throws IOException, XMLStreamException {
         = ObjectUtils.requireNonNull(
             (IBoundDefinitionModelAssembly) bindingContext.getBoundDefinitionForClass(MultiFieldAssembly.class));
 
-    IBoundInstanceModelField field1Instance = ObjectUtils.requireNonNull(assembly.getFieldInstanceByName("field1"));
+    IBoundInstanceModelField<?> field1Instance = ObjectUtils.requireNonNull(assembly.getFieldInstanceByName(
+        new QName(NS, "field1")));
 
-    IBoundInstanceModelField field2Instance = ObjectUtils.requireNonNull(assembly.getFieldInstanceByName("field2"));
+    IBoundInstanceModelField<?> field2Instance = ObjectUtils.requireNonNull(assembly.getFieldInstanceByName(
+        new QName(NS, "field2")));
 
     MultiFieldAssembly obj = new MultiFieldAssembly();
 
@@ -114,7 +119,7 @@ void testXmlReadFlagProperty() throws JsonParseException, IOException,
             .requireNonNull(
                 (IBoundDefinitionModelAssembly) bindingContext.getBoundDefinitionForClass(FlaggedAssembly.class));
 
-    IBoundInstanceFlag idProperty = assembly.getFlagInstanceByName("id");
+    IBoundInstanceFlag idProperty = assembly.getFlagInstanceByName(new QName("id"));
     assert idProperty != null;
 
     assertEquals(XMLStreamConstants.START_DOCUMENT, eventReader.nextEvent().getEventType());
@@ -158,11 +163,11 @@ void testXmlReadGroupedField() throws JsonParseException, IOException, XMLStream
         = ObjectUtils.requireNonNull(
             (IBoundDefinitionModelAssembly) bindingContext.getBoundDefinitionForClass(MultiFieldAssembly.class));
 
-    IBoundInstanceModelField field1Instance
-        = ObjectUtils.requireNonNull(assembly.getFieldInstanceByName("field1"));
+    IBoundInstanceModelField<?> field1Instance
+        = ObjectUtils.requireNonNull(assembly.getFieldInstanceByName(new QName(NS, "field1")));
 
-    IBoundInstanceModelField field2Instance
-        = ObjectUtils.requireNonNull(assembly.getFieldInstanceByName("field2"));
+    IBoundInstanceModelField<?> field2Instance
+        = ObjectUtils.requireNonNull(assembly.getFieldInstanceByName(new QName(NS, "field2")));
 
     MultiFieldAssembly obj = new MultiFieldAssembly();
 
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModelTestSupport.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModelTestSupport.java
index 8d7db28c9..6095d4dd3 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModelTestSupport.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/AbstractBoundModelTestSupport.java
@@ -30,6 +30,7 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.DefaultBindingContext;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
@@ -75,8 +76,8 @@ protected IBindingContext getBindingContext() {
   }
 
   @NonNull
-  protected IBoundDefinitionModel registerClassBinding(@NonNull Class<?> clazz) {
-    IBoundDefinitionModel definition = getBindingContext().getBoundDefinitionForClass(clazz);
+  protected IBoundDefinitionModelComplex registerClassBinding(@NonNull Class<? extends IBoundObject> clazz) {
+    IBoundDefinitionModelComplex definition = getBindingContext().getBoundDefinitionForClass(clazz);
     if (definition == null) {
       throw new IllegalArgumentException(String.format("Unable to find bound definition for class '%s'.",
           clazz.getName()));
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultAssemblyClassBindingTest.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultAssemblyClassBindingTest.java
index 72d19e0d9..68114421a 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultAssemblyClassBindingTest.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultAssemblyClassBindingTest.java
@@ -31,6 +31,7 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 
+import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.databind.io.json.MetaschemaJsonReader;
 
 import org.junit.jupiter.api.Test;
@@ -52,7 +53,7 @@ void testMinimalJsonParse() throws JsonParseException, IOException {
       IBoundDefinitionModelAssembly classBinding = getRootAssemblyClassBinding();
 
       try (JsonParser parser = newJsonParser(reader)) {
-        Object value = new MetaschemaJsonReader(parser).readProperty(classBinding, classBinding.getRootJsonName());
+        Object value = new MetaschemaJsonReader(parser).readObjectRoot(classBinding, classBinding.getRootJsonName());
         assertNotNull(value, "root was null");
       }
     }
@@ -61,7 +62,7 @@ void testMinimalJsonParse() throws JsonParseException, IOException {
   @Test
   void testModule() {
     IBoundDefinitionModelAssembly definition = getRootAssemblyClassBinding();
-    IBoundModule module = definition.getContainingModule();
+    IModule module = definition.getContainingModule();
     assertNotNull(module, "metaschema was null");
   }
 
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultFieldPropertyTest.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultFieldPropertyTest.java
index 90bf4da5f..0106b6f97 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultFieldPropertyTest.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/DefaultFieldPropertyTest.java
@@ -77,7 +77,7 @@ void testJsonReadFlag()
 
       MetaschemaJsonReader parser = new MetaschemaJsonReader(jsonParser);
 
-      SimpleAssembly obj = parser.readProperty(classBinding, classBinding.getRootJsonName());
+      SimpleAssembly obj = parser.readObjectRoot(classBinding, classBinding.getRootJsonName());
       assert obj != null;
 
       assertAll(
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/JsonKeyTest.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/JsonKeyTest.java
index 685a51ccc..e0aae3b2e 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/JsonKeyTest.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/JsonKeyTest.java
@@ -28,11 +28,11 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import gov.nist.secauto.metaschema.core.model.IMetaschemaModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.model.metaschema.BindingModuleLoader;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
 
 import org.junit.jupiter.api.Test;
 
@@ -51,7 +51,7 @@ class JsonKeyTest
 
   @Test
   void testJsonKey() throws IOException, MetaschemaException {
-    IBindingModule module = new BindingModuleLoader().load(ObjectUtils.requireNonNull(
+    IMetaschemaModule module = new BindingModuleLoader().load(ObjectUtils.requireNonNull(
         Paths.get("src/test/resources/metaschema/json-key/metaschema.xml")));
 
     IBindingContext bindingContext = IBindingContext.instance();
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/DefaultValueKeyField.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/DefaultValueKeyField.java
index b40a551ec..f55d81df6 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/DefaultValueKeyField.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/DefaultValueKeyField.java
@@ -26,18 +26,32 @@
 
 package gov.nist.secauto.metaschema.databind.model.test;
 
-import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue;
+import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField;
 
 @SuppressWarnings("PMD")
 @MetaschemaField(
     name = "simple-field",
     moduleClass = TestMetaschema.class)
-public class DefaultValueKeyField {
+public class DefaultValueKeyField implements IBoundObject {
+  private final IMetaschemaData metaschemaData;
+
   @BoundFieldValue
   private String _value;
 
   public DefaultValueKeyField() {
+    this(null);
+  }
+
+  public DefaultValueKeyField(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
   }
 
   public String getValue() {
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/EmptyBoundAssembly.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/EmptyBoundAssembly.java
index 4dfa027c9..71678aa01 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/EmptyBoundAssembly.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/EmptyBoundAssembly.java
@@ -26,9 +26,24 @@
 
 package gov.nist.secauto.metaschema.databind.model.test;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 
 @MetaschemaAssembly(name = "empty-bound-assembly", rootName = "root", moduleClass = TestMetaschema.class)
-public class EmptyBoundAssembly {
-  // no fields
+public class EmptyBoundAssembly implements IBoundObject {
+  private final IMetaschemaData metaschemaData;
+
+  public EmptyBoundAssembly() {
+    this(null);
+  }
+
+  public EmptyBoundAssembly(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
+  }
 }
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedAssembly.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedAssembly.java
index 0ef3ca8fe..57e16ce76 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedAssembly.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedAssembly.java
@@ -27,6 +27,8 @@
 package gov.nist.secauto.metaschema.databind.model.test;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.IntegerAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 
@@ -34,12 +36,27 @@
 
 // Used
 @MetaschemaAssembly(name = "flagged-assembly", rootName = "flagged-assembly", moduleClass = TestMetaschema.class)
-public class FlaggedAssembly {
+public class FlaggedAssembly implements IBoundObject {
+  private final IMetaschemaData metaschemaData;
+
   @BoundFlag(name = "id")
   private String id;
   @BoundFlag(name = "number", typeAdapter = IntegerAdapter.class)
   private BigInteger number;
 
+  public FlaggedAssembly() {
+    this(null);
+  }
+
+  public FlaggedAssembly(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
+  }
+
   public String getId() {
     return id;
   }
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundAssembly.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundAssembly.java
index c726037f3..79be9da8e 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundAssembly.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundAssembly.java
@@ -27,16 +27,33 @@
 package gov.nist.secauto.metaschema.databind.model.test;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.BooleanAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.JsonKey;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 
 @MetaschemaAssembly(name = "flagged-bound-assembly", moduleClass = TestMetaschema.class)
-public class FlaggedBoundAssembly {
+public class FlaggedBoundAssembly implements IBoundObject {
+  private final IMetaschemaData metaschemaData;
+
   @JsonKey
   @BoundFlag(name = "assembly-required-flag", required = true)
   private String id; // NOPMD
 
   @BoundFlag(name = "assembly-other-flag", typeAdapter = BooleanAdapter.class)
   private String other; // NOPMD
+
+  public FlaggedBoundAssembly() {
+    this(null);
+  }
+
+  public FlaggedBoundAssembly(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
+  }
 }
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundField.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundField.java
index ea11c8f42..6796528a9 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundField.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/FlaggedBoundField.java
@@ -28,13 +28,17 @@
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.BooleanAdapter;
 import gov.nist.secauto.metaschema.core.datatype.adapter.TokenAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.JsonKey;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField;
 
 @MetaschemaField(name = "flagged-bound-field", moduleClass = TestMetaschema.class)
-public class FlaggedBoundField {
+public class FlaggedBoundField implements IBoundObject {
+  private final IMetaschemaData metaschemaData;
+
   @JsonKey
   @BoundFlag(name = "field-required-flag", typeAdapter = TokenAdapter.class, required = true)
   private String id; // NOPMD - intentional
@@ -44,4 +48,17 @@ public class FlaggedBoundField {
 
   @BoundFieldValue(valueKeyName = "field-value")
   private String _value; // NOPMD - intentional
+
+  public FlaggedBoundField() {
+    this(null);
+  }
+
+  public FlaggedBoundField(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
+  }
 }
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/MultiFieldAssembly.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/MultiFieldAssembly.java
index f2cac2a02..b881d9bee 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/MultiFieldAssembly.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/MultiFieldAssembly.java
@@ -26,6 +26,8 @@
 
 package gov.nist.secauto.metaschema.databind.model.test;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
@@ -42,7 +44,9 @@
 // Used
 @SuppressWarnings("PMD")
 @MetaschemaAssembly(name = "test-field", moduleClass = TestMetaschema.class)
-public class MultiFieldAssembly {
+public class MultiFieldAssembly implements IBoundObject {
+  private final IMetaschemaData metaschemaData;
+
   @BoundField
   private String field1;
 
@@ -60,6 +64,16 @@ public class MultiFieldAssembly {
   private DefaultValueKeyField field4;
 
   public MultiFieldAssembly() {
+    this(null);
+  }
+
+  public MultiFieldAssembly(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
   }
 
   public String getField1() {
@@ -91,7 +105,9 @@ public void setField4(DefaultValueKeyField field4) {
   @MetaschemaField(
       name = "field-value-key",
       moduleClass = TestMetaschema.class)
-  public static class ValueKeyField {
+  public static class ValueKeyField implements IBoundObject {
+    private final IMetaschemaData metaschemaData;
+
     @BoundFlag
     private String flag;
 
@@ -99,6 +115,16 @@ public static class ValueKeyField {
     private String _value;
 
     public ValueKeyField() {
+      this(null);
+    }
+
+    public ValueKeyField(IMetaschemaData metaschemaData) {
+      this.metaschemaData = metaschemaData;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return metaschemaData;
     }
 
     public String getValue() {
@@ -110,7 +136,9 @@ public String getValue() {
   @MetaschemaField(
       name = "field-default-value-key",
       moduleClass = TestMetaschema.class)
-  public static class DefaultValueKeyField {
+  public static class DefaultValueKeyField implements IBoundObject {
+    private final IMetaschemaData metaschemaData;
+
     @BoundFlag
     private String flag;
 
@@ -118,6 +146,16 @@ public static class DefaultValueKeyField {
     private String _value;
 
     public DefaultValueKeyField() {
+      this(null);
+    }
+
+    public DefaultValueKeyField(IMetaschemaData metaschemaData) {
+      this.metaschemaData = metaschemaData;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return metaschemaData;
     }
 
     public String getValue() {
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/OnlyModelBoundAssembly.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/OnlyModelBoundAssembly.java
index 45162be1c..2c549a352 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/OnlyModelBoundAssembly.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/OnlyModelBoundAssembly.java
@@ -26,6 +26,8 @@
 
 package gov.nist.secauto.metaschema.databind.model.test;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
@@ -37,7 +39,9 @@
 
 @SuppressWarnings("PMD")
 @MetaschemaAssembly(name = "only-model", moduleClass = TestMetaschema.class)
-public class OnlyModelBoundAssembly { // NOPMD - intentional
+public class OnlyModelBoundAssembly implements IBoundObject { // NOPMD - intentional
+  private final IMetaschemaData metaschemaData;
+
   /*
    * ================ = simple field = ================
    */
@@ -160,4 +164,17 @@ public class OnlyModelBoundAssembly { // NOPMD - intentional
       groupAs = @GroupAs(name = "keyed-assembly-items",
           inJson = JsonGroupAsBehavior.KEYED))
   private Map<String, FlaggedBoundAssembly> keyedAssembly;
+
+  public OnlyModelBoundAssembly() {
+    this(null);
+  }
+
+  public OnlyModelBoundAssembly(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
+  }
 }
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/RootBoundAssembly.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/RootBoundAssembly.java
index 080083289..41009ff70 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/RootBoundAssembly.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/RootBoundAssembly.java
@@ -27,6 +27,8 @@
 package gov.nist.secauto.metaschema.databind.model.test;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.UuidAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundAssembly;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
@@ -39,7 +41,9 @@
 import java.util.UUID;
 
 @MetaschemaAssembly(name = "root", rootName = "root", moduleClass = TestMetaschema.class)
-public class RootBoundAssembly {
+public class RootBoundAssembly implements IBoundObject {
+  private final IMetaschemaData metaschemaData;
+
   @BoundFlag(name = "uuid", defaultValue = "374dd648-b247-483c-afd8-a66ba8876070", typeAdapter = UuidAdapter.class)
   private UUID uuid; // NOPMD - intentional
 
@@ -68,4 +72,17 @@ public class RootBoundAssembly {
       groupAs = @GroupAs(name = "singleton-or-array-assembly-items",
           inJson = JsonGroupAsBehavior.SINGLETON_OR_LIST))
   private List<OnlyModelBoundAssembly> singletonOrArrayAssembly; // NOPMD - intentional
+
+  public RootBoundAssembly() {
+    this(null);
+  }
+
+  public RootBoundAssembly(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
+  }
 }
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/SimpleAssembly.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/SimpleAssembly.java
index 985a4485f..e19c2b475 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/SimpleAssembly.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/SimpleAssembly.java
@@ -27,15 +27,18 @@
 package gov.nist.secauto.metaschema.databind.model.test;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.IntegerAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 
 import java.math.BigInteger;
 
 @SuppressWarnings("PMD")
-@MetaschemaAssembly(name = "simple-assembly", rootName = "test", moduleClass = TestMetaschema.class,
-    rootNamespace = "http://example.com/ns")
-public class SimpleAssembly {
+@MetaschemaAssembly(name = "simple-assembly", rootName = "test", moduleClass = TestMetaschema.class)
+public class SimpleAssembly implements IBoundObject {
+  private final IMetaschemaData metaschemaData;
+
   @BoundFlag(name = "id")
   private String _id;
 
@@ -43,6 +46,16 @@ public class SimpleAssembly {
   private BigInteger _number;
 
   public SimpleAssembly() {
+    this(null);
+  }
+
+  public SimpleAssembly(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
   }
 
   public String getId() {
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/TestMetaschema.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/TestMetaschema.java
index 54e852b81..5380e6c01 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/TestMetaschema.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/TestMetaschema.java
@@ -31,14 +31,14 @@
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.model.AbstractBoundModule;
-import gov.nist.secauto.metaschema.databind.model.annotations.Module;
+import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule;
 
 import java.net.URI;
 import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-@Module(
+@MetaschemaModule(
     assemblies = {
         EmptyBoundAssembly.class,
         FlaggedBoundAssembly.class,
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/ValueKeyField.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/ValueKeyField.java
index 57bc225ee..38d77ac97 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/ValueKeyField.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/model/test/ValueKeyField.java
@@ -26,6 +26,8 @@
 
 package gov.nist.secauto.metaschema.databind.model.test;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFieldValue;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaField;
 
@@ -33,11 +35,23 @@
 @MetaschemaField(
     name = "simple-field-value-key",
     moduleClass = TestMetaschema.class)
-public class ValueKeyField {
+public class ValueKeyField implements IBoundObject {
+  private final IMetaschemaData metaschemaData;
+
   @BoundFieldValue(valueKeyName = "a-value")
   private String _value;
 
   public ValueKeyField() {
+    this(null);
+  }
+
+  public ValueKeyField(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
   }
 
   public String getValue() {
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTest.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTest.java
index d27d119d2..b0944799f 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTest.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTest.java
@@ -55,8 +55,12 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 class ModelTest
     extends ModelTestBase {
+  private static final String NS = "https://csrc.nist.gov/ns/test/xml";
+
   @Nested
   class TestRootAssemblyWithFlags {
 
@@ -67,9 +71,12 @@ void testRootAssemblyWithFlags() {
       IBoundDefinitionModelComplex definition = ObjectUtils.requireNonNull(
           context.getBoundDefinitionForClass(RootAssemblyWithFlags.class));
 
-      IBoundInstanceFlag idFlag = ObjectUtils.requireNonNull(definition.getFlagInstanceByName("id"));
-      IBoundInstanceFlag defaultFlag = ObjectUtils.requireNonNull(definition.getFlagInstanceByName("defaultFlag"));
-      IBoundInstanceFlag numberFlag = ObjectUtils.requireNonNull(definition.getFlagInstanceByName("number"));
+      IBoundInstanceFlag idFlag = ObjectUtils.requireNonNull(definition.getFlagInstanceByName(
+          new QName("id")));
+      IBoundInstanceFlag defaultFlag = ObjectUtils.requireNonNull(definition.getFlagInstanceByName(
+          new QName("defaultFlag")));
+      IBoundInstanceFlag numberFlag = ObjectUtils.requireNonNull(definition.getFlagInstanceByName(
+          new QName("number")));
 
       assertAll(
           "root assembly",
@@ -151,18 +158,18 @@ void testRootAssemblyWithFields() {
       IBoundDefinitionModelAssembly definition = ObjectUtils.requireNonNull(
           (IBoundDefinitionModelAssembly) context.getBoundDefinitionForClass(RootAssemblyWithFields.class));
 
-      IBoundInstanceModelField defaultField = ObjectUtils.requireNonNull(
-          definition.getFieldInstanceByName("defaultField"));
-      IBoundInstanceModelField collectionField = ObjectUtils.requireNonNull(
-          definition.getFieldInstanceByName("field2"));
-      IBoundInstanceModelField specifiedValueKeyField = ObjectUtils.requireNonNull(
-          definition.getFieldInstanceByName("field-value-key"));
-      IBoundInstanceModelField defaultValueKeyField = ObjectUtils.requireNonNull(
-          definition.getFieldInstanceByName("field-default-value-key"));
-      IBoundInstanceModelField flagValueKeyField = ObjectUtils.requireNonNull(
-          definition.getFieldInstanceByName("field-flag-value-key"));
-      IBoundInstanceModelField flagJsonKeyField = ObjectUtils.requireNonNull(
-          definition.getFieldInstanceByName("field-json-key"));
+      IBoundInstanceModelField<?> defaultField = ObjectUtils.requireNonNull(
+          definition.getFieldInstanceByName(new QName(NS, "defaultField")));
+      IBoundInstanceModelField<?> collectionField = ObjectUtils.requireNonNull(
+          definition.getFieldInstanceByName(new QName(NS, "field2")));
+      IBoundInstanceModelField<?> specifiedValueKeyField = ObjectUtils.requireNonNull(
+          definition.getFieldInstanceByName(new QName(NS, "field-value-key")));
+      IBoundInstanceModelField<?> defaultValueKeyField = ObjectUtils.requireNonNull(
+          definition.getFieldInstanceByName(new QName(NS, "field-default-value-key")));
+      IBoundInstanceModelField<?> flagValueKeyField = ObjectUtils.requireNonNull(
+          definition.getFieldInstanceByName(new QName(NS, "field-flag-value-key")));
+      IBoundInstanceModelField<?> flagJsonKeyField = ObjectUtils.requireNonNull(
+          definition.getFieldInstanceByName(new QName(NS, "field-json-key")));
 
       assertAll(
           "root assembly",
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTestBase.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTestBase.java
index b0b63940f..55ac87887 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTestBase.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/ModelTestBase.java
@@ -32,6 +32,8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter;
+import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
+import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.model.IBoundDefinitionModelAssembly;
 import gov.nist.secauto.metaschema.databind.model.IBoundInstanceFlag;
@@ -69,11 +71,11 @@ public static void assertAssemblyDefinition(
             "formalName"),
         () -> assertEquals(
             ModelUtil.resolveNoneOrValue(annotation.description()),
-            Optional.ofNullable(assembly.getDescription()).map(value -> value.toMarkdown()).orElse(null),
+            Optional.ofNullable(assembly.getDescription()).map(MarkupLine::toMarkdown).orElse(null),
             "description"),
         () -> assertEquals(
             ModelUtil.resolveNoneOrValue(annotation.remarks()),
-            Optional.ofNullable(assembly.getRemarks()).map(value -> value.toMarkdown()).orElse(null),
+            Optional.ofNullable(assembly.getRemarks()).map(MarkupMultiline::toMarkdown).orElse(null),
             "remarks"),
         () -> {
           String rootName = ModelUtil.resolveNoneOrValue(annotation.rootName());
@@ -84,8 +86,7 @@ public static void assertAssemblyDefinition(
                     assembly.getRootName(),
                     "rootName"),
                 () -> assertEquals(
-                    Optional.ofNullable(ModelUtil.resolveOptionalNamespace(annotation.rootNamespace()))
-                        .orElse(assembly.getContainingModule().getXmlNamespace().toASCIIString()),
+                    assembly.getContainingModule().getXmlNamespace().toASCIIString(),
                     assembly.getRootXmlQName().getNamespaceURI(),
                     "rootNamespace"),
                 () -> assertTrue(true));
@@ -128,7 +129,7 @@ public static void assertFlagInstance(
             flag.isRequired(),
             "required"),
         () -> assertEquals(
-            ModelUtil.resolveNullOrValue(annotation.defaultValue(), adapter),
+            ModelUtil.resolveDefaultValue(annotation.defaultValue(), adapter),
             flag.getDefaultValue(),
             "defaultValue"),
         () -> assertEquals(
@@ -137,18 +138,18 @@ public static void assertFlagInstance(
             "formalName"),
         () -> assertEquals(
             ModelUtil.resolveNoneOrValue(annotation.description()),
-            Optional.ofNullable(flag.getDescription()).map(value -> value.toMarkdown()).orElse(null),
+            Optional.ofNullable(flag.getDescription()).map(MarkupLine::toMarkdown).orElse(null),
             "description"),
         () -> assertEquals(
             ModelUtil.resolveNoneOrValue(annotation.remarks()),
-            Optional.ofNullable(flag.getRemarks()).map(value -> value.toMarkdown()).orElse(null),
+            Optional.ofNullable(flag.getRemarks()).map(MarkupMultiline::toMarkdown).orElse(null),
             "remarks"));
   }
 
   public static void assertFieldInstance(
       @NonNull Class<?> assemblyClass,
       @NonNull String fieldJavaFieldName,
-      @NonNull IBoundInstanceModelField field,
+      @NonNull IBoundInstanceModelField<?> field,
       @NonNull IBindingContext context) throws NoSuchFieldException, SecurityException {
     Field javaField = assemblyClass.getDeclaredField(fieldJavaFieldName);
     BoundField annotation = javaField.getAnnotation(BoundField.class);
@@ -180,12 +181,11 @@ public static void assertFieldInstance(
             field.getDefinition().getJavaTypeAdapter(),
             "typeAdapter"),
         () -> assertEquals(
-            ModelUtil.resolveNullOrValue(annotation.defaultValue(), adapter),
+            ModelUtil.resolveDefaultValue(annotation.defaultValue(), adapter),
             field.getDefaultValue(),
             "defaultValue"),
         () -> assertEquals(
-            Optional.ofNullable(ModelUtil.resolveOptionalNamespace(annotation.namespace()))
-                .orElse(field.getContainingModule().getXmlNamespace().toASCIIString()),
+            field.getContainingModule().getXmlNamespace().toASCIIString(),
             field.getXmlNamespace(),
             "namespace"),
         () -> assertEquals(
@@ -206,11 +206,11 @@ public static void assertFieldInstance(
             "formalName"),
         () -> assertEquals(
             ModelUtil.resolveNoneOrValue(annotation.description()),
-            Optional.ofNullable(field.getDescription()).map(value -> value.toMarkdown()).orElse(null),
+            Optional.ofNullable(field.getDescription()).map(MarkupLine::toMarkdown).orElse(null),
             "description"),
         () -> assertEquals(
             ModelUtil.resolveNoneOrValue(annotation.remarks()),
-            Optional.ofNullable(field.getRemarks()).map(value -> value.toMarkdown()).orElse(null),
+            Optional.ofNullable(field.getRemarks()).map(MarkupMultiline::toMarkdown).orElse(null),
             "remarks"));
     // groupAs
   }
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFields.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFields.java
index e4054b703..451ce0b7b 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFields.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFields.java
@@ -26,6 +26,8 @@
 
 package gov.nist.secauto.metaschema.databind.testing.model;
 
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior;
 import gov.nist.secauto.metaschema.core.model.XmlGroupAsBehavior;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundField;
@@ -47,8 +49,10 @@
 @MetaschemaAssembly(
     name = "assembly-with-fields",
     rootName = "root-assembly-with-fields",
-    moduleClass = MetaschemaModule.class)
-public class RootAssemblyWithFields {
+    moduleClass = TestModule.class)
+public class RootAssemblyWithFields implements IBoundObject {
+  private final IMetaschemaData metaschemaData;
+
   @BoundField
   private String defaultField;
 
@@ -76,6 +80,16 @@ public class RootAssemblyWithFields {
   private Map<String, JsonKeyField> field6;
 
   public RootAssemblyWithFields() {
+    this(null);
+  }
+
+  public RootAssemblyWithFields(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
   }
 
   public String getField1() {
@@ -122,8 +136,10 @@ public void setField6(Map<String, JsonKeyField> field6) {
   @SuppressWarnings("PMD")
   @MetaschemaField(
       name = "field-value-key",
-      moduleClass = MetaschemaModule.class)
-  public static class ValueKeyField {
+      moduleClass = TestModule.class)
+  public static class ValueKeyField implements IBoundObject {
+    private final IMetaschemaData metaschemaData;
+
     @BoundFlag
     private String flag;
 
@@ -131,6 +147,16 @@ public static class ValueKeyField {
     private String _value;
 
     public ValueKeyField() {
+      this(null);
+    }
+
+    public ValueKeyField(IMetaschemaData metaschemaData) {
+      this.metaschemaData = metaschemaData;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return metaschemaData;
     }
 
     public String getFlag() {
@@ -145,8 +171,10 @@ public String getValue() {
   @SuppressWarnings("PMD")
   @MetaschemaField(
       name = "field-default-value-key",
-      moduleClass = MetaschemaModule.class)
-  public static class DefaultValueKeyField {
+      moduleClass = TestModule.class)
+  public static class DefaultValueKeyField implements IBoundObject {
+    private final IMetaschemaData metaschemaData;
+
     @BoundFlag
     private String flag;
 
@@ -154,6 +182,16 @@ public static class DefaultValueKeyField {
     private String _value;
 
     public DefaultValueKeyField() {
+      this(null);
+    }
+
+    public DefaultValueKeyField(IMetaschemaData metaschemaData) {
+      this.metaschemaData = metaschemaData;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return metaschemaData;
     }
 
     public String getFlag() {
@@ -168,8 +206,10 @@ public String getValue() {
   @SuppressWarnings("PMD")
   @MetaschemaField(
       name = "field-flag-value-key",
-      moduleClass = MetaschemaModule.class)
-  public static class FlagValueKeyField {
+      moduleClass = TestModule.class)
+  public static class FlagValueKeyField implements IBoundObject {
+    private final IMetaschemaData metaschemaData;
+
     @BoundFlag
     @JsonFieldValueKeyFlag
     private String flag;
@@ -178,6 +218,16 @@ public static class FlagValueKeyField {
     private String _value;
 
     public FlagValueKeyField() {
+      this(null);
+    }
+
+    public FlagValueKeyField(IMetaschemaData metaschemaData) {
+      this.metaschemaData = metaschemaData;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return metaschemaData;
     }
 
     public String getFlag() {
@@ -192,8 +242,10 @@ public String getValue() {
   @SuppressWarnings("PMD")
   @MetaschemaField(
       name = "field-json-key",
-      moduleClass = MetaschemaModule.class)
-  public static class JsonKeyField {
+      moduleClass = TestModule.class)
+  public static class JsonKeyField implements IBoundObject {
+    private final IMetaschemaData metaschemaData;
+
     @BoundFlag
     @JsonKey
     private String key;
@@ -206,6 +258,16 @@ public static class JsonKeyField {
     private String _value;
 
     public JsonKeyField() {
+      this(null);
+    }
+
+    public JsonKeyField(IMetaschemaData metaschemaData) {
+      this.metaschemaData = metaschemaData;
+    }
+
+    @Override
+    public IMetaschemaData getMetaschemaData() {
+      return metaschemaData;
     }
 
     public String getKey() {
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFlags.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFlags.java
index cd7e0ced7..6c5aee574 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFlags.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/RootAssemblyWithFlags.java
@@ -27,6 +27,8 @@
 package gov.nist.secauto.metaschema.databind.testing.model;
 
 import gov.nist.secauto.metaschema.core.datatype.adapter.IntegerAdapter;
+import gov.nist.secauto.metaschema.core.model.IBoundObject;
+import gov.nist.secauto.metaschema.core.model.IMetaschemaData;
 import gov.nist.secauto.metaschema.databind.model.annotations.BoundFlag;
 import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaAssembly;
 
@@ -35,8 +37,9 @@
 @MetaschemaAssembly(
     name = "assembly-with-flags",
     rootName = "root-assembly-with-flags",
-    moduleClass = MetaschemaModule.class)
-public class RootAssemblyWithFlags {
+    moduleClass = TestModule.class)
+public class RootAssemblyWithFlags implements IBoundObject {
+  private final IMetaschemaData metaschemaData;
 
   @BoundFlag(name = "id", required = true)
   private String id;
@@ -53,6 +56,19 @@ public class RootAssemblyWithFlags {
       remarks = "a remark")
   private BigInteger number;
 
+  public RootAssemblyWithFlags() {
+    this(null);
+  }
+
+  public RootAssemblyWithFlags(IMetaschemaData metaschemaData) {
+    this.metaschemaData = metaschemaData;
+  }
+
+  @Override
+  public IMetaschemaData getMetaschemaData() {
+    return metaschemaData;
+  }
+
   public String getId() {
     return id;
   }
diff --git a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/MetaschemaModule.java b/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/TestModule.java
similarity index 95%
rename from databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/MetaschemaModule.java
rename to databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/TestModule.java
index 6aa655e68..4bb245164 100644
--- a/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/MetaschemaModule.java
+++ b/databind/src/test/java/gov/nist/secauto/metaschema/databind/testing/model/TestModule.java
@@ -32,22 +32,22 @@
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.model.AbstractBoundModule;
 import gov.nist.secauto.metaschema.databind.model.IBoundModule;
-import gov.nist.secauto.metaschema.databind.model.annotations.Module;
+import gov.nist.secauto.metaschema.databind.model.annotations.MetaschemaModule;
 
 import java.net.URI;
 import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-@Module(
+@MetaschemaModule(
     assemblies = {
         RootAssemblyWithFlags.class,
         RootAssemblyWithFields.class
     })
-public class MetaschemaModule
+public class TestModule
     extends AbstractBoundModule {
 
-  public MetaschemaModule(
+  public TestModule(
       @NonNull List<? extends IBoundModule> importedModules,
       @NonNull IBindingContext bindingContext) {
     super(importedModules, bindingContext);
diff --git a/databind/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension-removed b/databind/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension-removed
deleted file mode 100644
index a65f5a7fa..000000000
--- a/databind/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension-removed
+++ /dev/null
@@ -1 +0,0 @@
-gov.nist.secauto.metaschema.databind.test.Log4jTestWatcher
diff --git a/databind/src/test/resources/gov/nist/secauto/metaschema/codegen/test/parent.json b/databind/src/test/resources/gov/nist/secauto/metaschema/codegen/test/parent.json
index 8023c1d8a..ac12f4e77 100644
--- a/databind/src/test/resources/gov/nist/secauto/metaschema/codegen/test/parent.json
+++ b/databind/src/test/resources/gov/nist/secauto/metaschema/codegen/test/parent.json
@@ -1,9 +1,9 @@
-{
-  "parent": {
-    "props": {
-      "id3": {"STRVALUE": "test3"},
-      "id2": {"STRVALUE": ""},
-      "id1": {"STRVALUE": "test1"}
-    }
-  }
+{
+  "parent": {
+    "props": {
+      "id3": {"STRVALUE": "test3"},
+      "id2": {"STRVALUE": ""},
+      "id1": {"STRVALUE": "test1"}
+    }
+  }
 }
\ No newline at end of file
diff --git a/databind/src/test/resources/metaschema/assembly/example.json b/databind/src/test/resources/metaschema/assembly/example.json
index 6a7c32ae5..5838cbde9 100644
--- a/databind/src/test/resources/metaschema/assembly/example.json
+++ b/databind/src/test/resources/metaschema/assembly/example.json
@@ -1,83 +1,83 @@
-{
-    "$schema": "schema.json",
-    "top-level": {
-        "id": "test",
-        "children": [
-            {
-                "id": "child1",
-                "grandchildren": {
-                    "id": "singleton-ungrouped",
-                    "fields": {
-                        "id": "field1",
-                        "STRVALUE": "value1"
-                    }
-                },
-                "grandchildren2": [
-                    {
-                        "id": "multiple-grouped-1",
-                        "fields": {
-                            "id": "field2a",
-                            "STRVALUE": "value2a"
-                        }
-                    },
-                    {
-                        "id": "multiple-grouped-2",
-                        "fields": {
-                            "id": "field2b",
-                            "STRVALUE": "value2b"
-                        }
-                    }
-                ],
-                "grandchild": {
-                    "id": "single-1",
-                    "fields": {
-                        "id": "field3",
-                        "STRVALUE": "value3"
-                    }
-                }
-            },
-            {
-                "id": "child2",
-                "grandchildren": [
-                    {
-                        "id": "multiple-ungrouped-1",
-                        "fields": {
-                            "id": "field4",
-                            "STRVALUE": "value4"
-                        }
-                    },
-                    {
-                        "id": "multiple-ungrouped-2",
-                        "fields": {
-                            "id": "field5",
-                            "STRVALUE": "value6"
-                        }
-                    }
-                ],
-                "grandchildren2": [
-                    {
-                        "id": "multiple-grouped-3",
-                        "fields": {
-                            "id": "field6",
-                            "STRVALUE": "value6"
-                        }
-                    },
-                    {
-                        "id": "multiple-grouped-4",
-                        "fields": {
-                            "id": "field7",
-                            "STRVALUE": "value7"
-                        }
-                    }
-                ],
-                "grandchild": {
-                    "id": "single-2",
-                    "fields": {
-                        "id": "field8",
-                        "STRVALUE": "value8"
-                    }
-                }
-            }
-        ]
-    }
+{
+    "$schema": "schema.json",
+    "top-level": {
+        "id": "test",
+        "children": [
+            {
+                "id": "child1",
+                "grandchildren": {
+                    "id": "singleton-ungrouped",
+                    "fields": {
+                        "id": "field1",
+                        "STRVALUE": "value1"
+                    }
+                },
+                "grandchildren2": [
+                    {
+                        "id": "multiple-grouped-1",
+                        "fields": {
+                            "id": "field2a",
+                            "STRVALUE": "value2a"
+                        }
+                    },
+                    {
+                        "id": "multiple-grouped-2",
+                        "fields": {
+                            "id": "field2b",
+                            "STRVALUE": "value2b"
+                        }
+                    }
+                ],
+                "grandchild": {
+                    "id": "single-1",
+                    "fields": {
+                        "id": "field3",
+                        "STRVALUE": "value3"
+                    }
+                }
+            },
+            {
+                "id": "child2",
+                "grandchildren": [
+                    {
+                        "id": "multiple-ungrouped-1",
+                        "fields": {
+                            "id": "field4",
+                            "STRVALUE": "value4"
+                        }
+                    },
+                    {
+                        "id": "multiple-ungrouped-2",
+                        "fields": {
+                            "id": "field5",
+                            "STRVALUE": "value6"
+                        }
+                    }
+                ],
+                "grandchildren2": [
+                    {
+                        "id": "multiple-grouped-3",
+                        "fields": {
+                            "id": "field6",
+                            "STRVALUE": "value6"
+                        }
+                    },
+                    {
+                        "id": "multiple-grouped-4",
+                        "fields": {
+                            "id": "field7",
+                            "STRVALUE": "value7"
+                        }
+                    }
+                ],
+                "grandchild": {
+                    "id": "single-2",
+                    "fields": {
+                        "id": "field8",
+                        "STRVALUE": "value8"
+                    }
+                }
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/databind/src/test/resources/metaschema/assembly/example.xml b/databind/src/test/resources/metaschema/assembly/example.xml
index cb430be3b..f95c55edf 100644
--- a/databind/src/test/resources/metaschema/assembly/example.xml
+++ b/databind/src/test/resources/metaschema/assembly/example.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<top-level xmlns="http://csrc.nist.gov/ns/metaschema/testing/assembly" id="test">
-  <child id="child1">
-    <grandchild-a id="singleton-ungrouped">
-      <field id="field1">value1</field>
-    </grandchild-a>
-    <grandchildren2>
-      <grandchild-b id="multiple-grouped-1">
-        <field id="field2a">value2a</field>
-      </grandchild-b>
-      <grandchild-b id="multiple-grouped-2">
-        <field id="field2b">value2b</field>
-      </grandchild-b>
-    </grandchildren2>
-    <grandchild-c id="single-1">
-      <field id="field3">value3</field>
-    </grandchild-c>
-  </child>
-  <child id="child2">
-    <grandchild-a id="multiple-ungrouped-1">
-      <!-- comment -->
-      <field id="field4">value4</field>
-    </grandchild-a>
-    <grandchild-a id="multiple-ungrouped-2">
-      <field id="field5">value5</field>
-    </grandchild-a>
-    <grandchildren2>
-      <grandchild-b id="multiple-grouped-3">
-        <field id="field6">value6</field>
-      </grandchild-b>
-      <grandchild-b id="multiple-grouped-4">
-        <field id="field7">value7</field>
-      </grandchild-b>
-    </grandchildren2>
-    <grandchild-c id="single-2">
-      <field id="field8">value8</field>
-    </grandchild-c>
-  </child>
-</top-level>
+<?xml version="1.0" encoding="UTF-8"?>
+<top-level xmlns="http://csrc.nist.gov/ns/metaschema/testing/assembly" id="test">
+  <child id="child1">
+    <grandchild-a id="singleton-ungrouped">
+      <field id="field1">value1</field>
+    </grandchild-a>
+    <grandchildren2>
+      <grandchild-b id="multiple-grouped-1">
+        <field id="field2a">value2a</field>
+      </grandchild-b>
+      <grandchild-b id="multiple-grouped-2">
+        <field id="field2b">value2b</field>
+      </grandchild-b>
+    </grandchildren2>
+    <grandchild-c id="single-1">
+      <field id="field3">value3</field>
+    </grandchild-c>
+  </child>
+  <child id="child2">
+    <grandchild-a id="multiple-ungrouped-1">
+      <!-- comment -->
+      <field id="field4">value4</field>
+    </grandchild-a>
+    <grandchild-a id="multiple-ungrouped-2">
+      <field id="field5">value5</field>
+    </grandchild-a>
+    <grandchildren2>
+      <grandchild-b id="multiple-grouped-3">
+        <field id="field6">value6</field>
+      </grandchild-b>
+      <grandchild-b id="multiple-grouped-4">
+        <field id="field7">value7</field>
+      </grandchild-b>
+    </grandchildren2>
+    <grandchild-c id="single-2">
+      <field id="field8">value8</field>
+    </grandchild-c>
+  </child>
+</top-level>
diff --git a/databind/src/test/resources/metaschema/assembly/metaschema.xml b/databind/src/test/resources/metaschema/assembly/metaschema.xml
index 612d02633..3d6bc3255 100644
--- a/databind/src/test/resources/metaschema/assembly/metaschema.xml
+++ b/databind/src/test/resources/metaschema/assembly/metaschema.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<METASCHEMA
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../../../../core/metaschema/schema/xml/metaschema.xsd"
-	xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-	xmlns:binding="http://csrc.nist.gov/ns/oscal/metaschema-binding/1.0">
-	<schema-name>Metaschema with assembly</schema-name>
-	<schema-version>1.0</schema-version>
-	<short-name>assembly</short-name>
-	<namespace>http://csrc.nist.gov/ns/metaschema/testing/assembly</namespace>
-    <json-base-uri>http://csrc.nist.gov/ns/metaschema/testing/assembly</json-base-uri>
-
-	<define-assembly name="top-level">
-		<formal-name>Root</formal-name>
-		<description>Root assembly</description>
-		<root-name>top-level</root-name>
-		<flag ref="id" />
-		<model>
-			<assembly ref="child" min-occurs="1" max-occurs="unbounded">
-				<group-as name="children" />
-			</assembly>
-		</model>
-	</define-assembly>
-
-	<define-assembly name="child">
-		<formal-name>Child</formal-name>
-		<description>Child assembly</description>
-		<flag ref="id" required="yes" />
-		<model>
-			<assembly ref="grandchild" min-occurs="1"
-				max-occurs="unbounded">
-				<group-as name="grandchildren" in-json="SINGLETON_OR_ARRAY"
-					in-xml="UNGROUPED" />
-			</assembly>
-			<assembly ref="grandchild" min-occurs="1"
-				max-occurs="unbounded">
-				<use-name>grandchild-b</use-name>
-				<group-as name="grandchildren2" in-json="ARRAY"
-					in-xml="GROUPED" />
-			</assembly>
-			<assembly ref="grandchild" min-occurs="1">
-				<use-name>grandchild-c</use-name>
-			</assembly>
-		</model>
-	</define-assembly>
-
-	<define-assembly name="grandchild">
-		<formal-name>Child</formal-name>
-		<description>Child assembly</description>
-		<use-name>grandchild-a</use-name>
-		<flag ref="id" />
-		<model>
-			<field ref="field" max-occurs="unbounded">
-				<group-as name="fields" />
-			</field>
-		</model>
-	</define-assembly>
-
-	<define-field name="field">
-		<formal-name>Complex Field</formal-name>
-		<description>A complex field with a flag</description>
-		<flag ref="id" />
-	</define-field>
-
-	<define-flag name="id">
-		<formal-name>Identifier</formal-name>
-		<description>The document identifier</description>
-	</define-flag>
-</METASCHEMA>
+<?xml version="1.0" encoding="UTF-8"?>
+<METASCHEMA
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../../../../core/metaschema/schema/xml/metaschema.xsd"
+	xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+	xmlns:binding="http://csrc.nist.gov/ns/oscal/metaschema-binding/1.0">
+	<schema-name>Metaschema with assembly</schema-name>
+	<schema-version>1.0</schema-version>
+	<short-name>assembly</short-name>
+	<namespace>http://csrc.nist.gov/ns/metaschema/testing/assembly</namespace>
+    <json-base-uri>http://csrc.nist.gov/ns/metaschema/testing/assembly</json-base-uri>
+
+	<define-assembly name="top-level">
+		<formal-name>Root</formal-name>
+		<description>Root assembly</description>
+		<root-name>top-level</root-name>
+		<flag ref="id" />
+		<model>
+			<assembly ref="child" min-occurs="1" max-occurs="unbounded">
+				<group-as name="children" />
+			</assembly>
+		</model>
+	</define-assembly>
+
+	<define-assembly name="child">
+		<formal-name>Child</formal-name>
+		<description>Child assembly</description>
+		<flag ref="id" required="yes" />
+		<model>
+			<assembly ref="grandchild" min-occurs="1"
+				max-occurs="unbounded">
+				<group-as name="grandchildren" in-json="SINGLETON_OR_ARRAY"
+					in-xml="UNGROUPED" />
+			</assembly>
+			<assembly ref="grandchild" min-occurs="1"
+				max-occurs="unbounded">
+				<use-name>grandchild-b</use-name>
+				<group-as name="grandchildren2" in-json="ARRAY"
+					in-xml="GROUPED" />
+			</assembly>
+			<assembly ref="grandchild" min-occurs="1">
+				<use-name>grandchild-c</use-name>
+			</assembly>
+		</model>
+	</define-assembly>
+
+	<define-assembly name="grandchild">
+		<formal-name>Child</formal-name>
+		<description>Child assembly</description>
+		<use-name>grandchild-a</use-name>
+		<flag ref="id" />
+		<model>
+			<field ref="field" max-occurs="unbounded">
+				<group-as name="fields" />
+			</field>
+		</model>
+	</define-assembly>
+
+	<define-field name="field">
+		<formal-name>Complex Field</formal-name>
+		<description>A complex field with a flag</description>
+		<flag ref="id" />
+	</define-field>
+
+	<define-flag name="id">
+		<formal-name>Identifier</formal-name>
+		<description>The document identifier</description>
+	</define-flag>
+</METASCHEMA>
diff --git a/databind/src/test/resources/metaschema/bad_index-has-key/example.json b/databind/src/test/resources/metaschema/bad_index-has-key/example.json
index 426313de2..6ec9d9e63 100644
--- a/databind/src/test/resources/metaschema/bad_index-has-key/example.json
+++ b/databind/src/test/resources/metaschema/bad_index-has-key/example.json
@@ -1,12 +1,12 @@
-{
-    "root": {
-        "wrappers": [
-            {
-                "id": "a"
-            },
-            {
-                "id": "b"
-            }
-        ]
-    }
+{
+    "root": {
+        "wrappers": [
+            {
+                "id": "a"
+            },
+            {
+                "id": "b"
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/databind/src/test/resources/metaschema/fields_with_flags/example.json b/databind/src/test/resources/metaschema/fields_with_flags/example.json
index 7240e099a..a770cb807 100644
--- a/databind/src/test/resources/metaschema/fields_with_flags/example.json
+++ b/databind/src/test/resources/metaschema/fields_with_flags/example.json
@@ -1,28 +1,28 @@
-{
-  "$schema": "schema.json",
-  "top-level": {
-    "id": "test",
-    "complex-field1": {
-      "id": "complex-field1",
-      "STRVALUE": "test-string"
-    },
-    "complex-fields2": {
-      "id": "complex-field2-1",
-      "STRVALUE": "test-string2"
-    },
-    "complex-fields3": [
-      {
-        "id2": "complex-field3-1",
-        "STRVALUE": "test-string3"
-      },
-      {
-        "id2": "complex-field3-2",
-        "STRVALUE": "test-string4"
-      }
-    ],
-    "complex-fields4": {
-      "complex-field4-1": {"STRVALUE": "test-string5"},
-      "complex-field4-2": {"STRVALUE": "test-string6"}
-    }
-  }
+{
+  "$schema": "schema.json",
+  "top-level": {
+    "id": "test",
+    "complex-field1": {
+      "id": "complex-field1",
+      "STRVALUE": "test-string"
+    },
+    "complex-fields2": {
+      "id": "complex-field2-1",
+      "STRVALUE": "test-string2"
+    },
+    "complex-fields3": [
+      {
+        "id2": "complex-field3-1",
+        "STRVALUE": "test-string3"
+      },
+      {
+        "id2": "complex-field3-2",
+        "STRVALUE": "test-string4"
+      }
+    ],
+    "complex-fields4": {
+      "complex-field4-1": {"STRVALUE": "test-string5"},
+      "complex-field4-2": {"STRVALUE": "test-string6"}
+    }
+  }
 }
\ No newline at end of file
diff --git a/databind/src/test/resources/metaschema/fields_with_flags/example.xml b/databind/src/test/resources/metaschema/fields_with_flags/example.xml
index fc1abb27f..982076db1 100644
--- a/databind/src/test/resources/metaschema/fields_with_flags/example.xml
+++ b/databind/src/test/resources/metaschema/fields_with_flags/example.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<top-level xmlns="http://csrc.nist.gov/ns/metaschema/testing/fields/with/flags" id="test">
-  <complex-field1 id="complex-field1">test-string</complex-field1>
-  <cmplx-fd2 id="complex-field2-1">test-string2</cmplx-fd2>
-  <complex-fields3>
-    <complex-field3 id2="complex-field3-1">test-string3</complex-field3>
-    <complex-field3 id2="complex-field3-2">test-string4</complex-field3>
-  </complex-fields3>
-  <complex-field4 id2="complex-field4-1">test-string5</complex-field4>
-  <complex-field4 id2="complex-field4-2">test-string6</complex-field4>
-</top-level>
+<?xml version="1.0" encoding="UTF-8"?>
+<top-level xmlns="http://csrc.nist.gov/ns/metaschema/testing/fields/with/flags" id="test">
+  <complex-field1 id="complex-field1">test-string</complex-field1>
+  <cmplx-fd2 id="complex-field2-1">test-string2</cmplx-fd2>
+  <complex-fields3>
+    <complex-field3 id2="complex-field3-1">test-string3</complex-field3>
+    <complex-field3 id2="complex-field3-2">test-string4</complex-field3>
+  </complex-fields3>
+  <complex-field4 id2="complex-field4-1">test-string5</complex-field4>
+  <complex-field4 id2="complex-field4-2">test-string6</complex-field4>
+</top-level>
diff --git a/databind/src/test/resources/metaschema/fields_with_flags/metaschema.xml b/databind/src/test/resources/metaschema/fields_with_flags/metaschema.xml
index 8cdc3fb05..809fd1c47 100644
--- a/databind/src/test/resources/metaschema/fields_with_flags/metaschema.xml
+++ b/databind/src/test/resources/metaschema/fields_with_flags/metaschema.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../../../../core/metaschema/schema/xml/metaschema.xsd"
- xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
-  <schema-name>Metaschema with complex field</schema-name>
-  <schema-version>1.0</schema-version>
-  <short-name>complex-field</short-name>
-  <namespace>http://csrc.nist.gov/ns/metaschema/testing/fields/with/flags</namespace>
-  <json-base-uri>http://csrc.nist.gov/ns/metaschema/testing/fields/with/flags</json-base-uri>
-  
-  <define-assembly name="top-level">
-    <formal-name>Root</formal-name>
-    <description>Root assembly</description>
-    <root-name>top-level</root-name>
-    <flag ref="id"/>
-    <model>
-      <field ref="complex-field1"/>
-      <field ref="complex-field2" min-occurs="1" max-occurs="unbounded">
-      	<use-name>cmplx-fd2</use-name>
-        <group-as name="complex-fields2" in-xml="UNGROUPED" />
-      </field>
-      <field ref="complex-field3" min-occurs="2" max-occurs="unbounded">
-        <group-as name="complex-fields3" in-json="ARRAY" in-xml="GROUPED" />
-      </field>
-      <field ref="complex-field4" max-occurs="unbounded">
-        <group-as name="complex-fields4" in-json="BY_KEY" />
-      </field>
-    </model>
-  </define-assembly>
-
-  <define-field name="complex-field1">
-    <formal-name>Complex Field 1</formal-name>
-    <description>A complex field with a flag</description>
-    <flag ref="id"/>
-  </define-field>
-  
-  <define-field name="complex-field2">
-    <formal-name>Complex Field 1</formal-name>
-    <description>A complex field with a flag</description>
-    <flag ref="id"/>
-  </define-field>
-  
-  <define-field name="complex-field3">
-    <formal-name>Complex Field 3</formal-name>
-    <description>A complex field with a flag</description>
-    <define-flag name="id2">
-      <formal-name>A flag</formal-name>
-      <description>A simple flag</description>
-    </define-flag>
-  </define-field>
-  
-  <define-field name="complex-field4">
-    <formal-name>Complex Field 4</formal-name>
-    <description>A complex field with a flag</description>
-    <json-key flag-ref="id2"/>
-    <define-flag name="id2">
-      <formal-name>A flag</formal-name>
-      <description>A simple flag</description>
-    </define-flag>
-  </define-field>
-  
-  <define-flag name="id">
-    <formal-name>Identifier</formal-name>
-    <description>The document identifier</description>
-  </define-flag>
-</METASCHEMA>
+<?xml version="1.0" encoding="UTF-8"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../../../../core/metaschema/schema/xml/metaschema.xsd"
+ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
+  <schema-name>Metaschema with complex field</schema-name>
+  <schema-version>1.0</schema-version>
+  <short-name>complex-field</short-name>
+  <namespace>http://csrc.nist.gov/ns/metaschema/testing/fields/with/flags</namespace>
+  <json-base-uri>http://csrc.nist.gov/ns/metaschema/testing/fields/with/flags</json-base-uri>
+  
+  <define-assembly name="top-level">
+    <formal-name>Root</formal-name>
+    <description>Root assembly</description>
+    <root-name>top-level</root-name>
+    <flag ref="id"/>
+    <model>
+      <field ref="complex-field1"/>
+      <field ref="complex-field2" min-occurs="1" max-occurs="unbounded">
+      	<use-name>cmplx-fd2</use-name>
+        <group-as name="complex-fields2" in-xml="UNGROUPED" />
+      </field>
+      <field ref="complex-field3" min-occurs="2" max-occurs="unbounded">
+        <group-as name="complex-fields3" in-json="ARRAY" in-xml="GROUPED" />
+      </field>
+      <field ref="complex-field4" max-occurs="unbounded">
+        <group-as name="complex-fields4" in-json="BY_KEY" />
+      </field>
+    </model>
+  </define-assembly>
+
+  <define-field name="complex-field1">
+    <formal-name>Complex Field 1</formal-name>
+    <description>A complex field with a flag</description>
+    <flag ref="id"/>
+  </define-field>
+  
+  <define-field name="complex-field2">
+    <formal-name>Complex Field 1</formal-name>
+    <description>A complex field with a flag</description>
+    <flag ref="id"/>
+  </define-field>
+  
+  <define-field name="complex-field3">
+    <formal-name>Complex Field 3</formal-name>
+    <description>A complex field with a flag</description>
+    <define-flag name="id2">
+      <formal-name>A flag</formal-name>
+      <description>A simple flag</description>
+    </define-flag>
+  </define-field>
+  
+  <define-field name="complex-field4">
+    <formal-name>Complex Field 4</formal-name>
+    <description>A complex field with a flag</description>
+    <json-key flag-ref="id2"/>
+    <define-flag name="id2">
+      <formal-name>A flag</formal-name>
+      <description>A simple flag</description>
+    </define-flag>
+  </define-field>
+  
+  <define-flag name="id">
+    <formal-name>Identifier</formal-name>
+    <description>The document identifier</description>
+  </define-flag>
+</METASCHEMA>
diff --git a/databind/src/test/resources/metaschema/simple/example.json b/databind/src/test/resources/metaschema/simple/example.json
index 7ff0133a3..b591e6ec3 100644
--- a/databind/src/test/resources/metaschema/simple/example.json
+++ b/databind/src/test/resources/metaschema/simple/example.json
@@ -1,3 +1,3 @@
-{
-  "top-level": {"id": "test"}
+{
+  "top-level": {"id": "test"}
 }
\ No newline at end of file
diff --git a/databind/src/test/resources/metaschema/simple/example.xml b/databind/src/test/resources/metaschema/simple/example.xml
index 52fd40ca8..65ac3c890 100644
--- a/databind/src/test/resources/metaschema/simple/example.xml
+++ b/databind/src/test/resources/metaschema/simple/example.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<top-level xmlns="http://csrc.nist.gov/ns/metaschema/testing/simple" id="test"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<top-level xmlns="http://csrc.nist.gov/ns/metaschema/testing/simple" id="test"/>
diff --git a/databind/src/test/resources/metaschema/simple/metaschema.xml b/databind/src/test/resources/metaschema/simple/metaschema.xml
index be2bc23be..efb07af38 100644
--- a/databind/src/test/resources/metaschema/simple/metaschema.xml
+++ b/databind/src/test/resources/metaschema/simple/metaschema.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../../../../core/metaschema/schema/xml/metaschema.xsd"
- xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
-  <schema-name>Simple Metaschema</schema-name>
-  <schema-version>1.0</schema-version>
-  <short-name>simple</short-name>
-  <namespace>http://csrc.nist.gov/ns/metaschema/testing/simple</namespace>
-  <json-base-uri>http://csrc.nist.gov/ns/metaschema/testing/simple</json-base-uri>
-  
-  <define-assembly name="top-level">
-    <formal-name>Root</formal-name>
-    <description>Root assembly</description>
-    <root-name>top-level</root-name>
-    <flag ref="id"/>
-    <model/>
-  </define-assembly>
-  
-  <define-flag name="id">
-    <formal-name>Identifier</formal-name>
-    <description>The document identifier</description>
-  </define-flag>
-</METASCHEMA>
+<?xml version="1.0" encoding="UTF-8"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../../../../core/metaschema/schema/xml/metaschema.xsd"
+ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
+  <schema-name>Simple Metaschema</schema-name>
+  <schema-version>1.0</schema-version>
+  <short-name>simple</short-name>
+  <namespace>http://csrc.nist.gov/ns/metaschema/testing/simple</namespace>
+  <json-base-uri>http://csrc.nist.gov/ns/metaschema/testing/simple</json-base-uri>
+  
+  <define-assembly name="top-level">
+    <formal-name>Root</formal-name>
+    <description>Root assembly</description>
+    <root-name>top-level</root-name>
+    <flag ref="id"/>
+    <model/>
+  </define-assembly>
+  
+  <define-flag name="id">
+    <formal-name>Identifier</formal-name>
+    <description>The document identifier</description>
+  </define-flag>
+</METASCHEMA>
diff --git a/databind/src/test/resources/metaschema/simple_with_field/example.json b/databind/src/test/resources/metaschema/simple_with_field/example.json
index bdea751c8..be6697dd5 100644
--- a/databind/src/test/resources/metaschema/simple_with_field/example.json
+++ b/databind/src/test/resources/metaschema/simple_with_field/example.json
@@ -1,11 +1,11 @@
-{
-  "top-level": {
-    "id": "test",
-    "field": "field-value",
-    "field2": "field-value2",
-    "field3": "field-value3",
-    "field4s": [ "markdown-string1", "markdown-string2" ],
-    "field5s": [ "string1", "string2" ], 
-    "field6s": [ true, false ]
-  }
+{
+  "top-level": {
+    "id": "test",
+    "field": "field-value",
+    "field2": "field-value2",
+    "field3": "field-value3",
+    "field4s": [ "markdown-string1", "markdown-string2" ],
+    "field5s": [ "string1", "string2" ], 
+    "field6s": [ true, false ]
+  }
 }
\ No newline at end of file
diff --git a/databind/src/test/resources/metaschema/simple_with_field/example.xml b/databind/src/test/resources/metaschema/simple_with_field/example.xml
index a347fd680..656982b3d 100644
--- a/databind/src/test/resources/metaschema/simple_with_field/example.xml
+++ b/databind/src/test/resources/metaschema/simple_with_field/example.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<top-level xmlns="http://csrc.nist.gov/ns/metaschema/testing/simple/with/field" id="test">
-	<field>field-value</field>
-	<field2>
-		<p><b>bold</b> <i>italics</i>field2-markup1</p>
-		<p>field2-markup2</p>
-	</field2>
-	<field3>field-value3</field3>
-	<field4s>
-		<field4><p>markdown-string1<a href="url">link-text</a></p></field4>
-		<field4><p>markdown-string2</p></field4>
-	</field4s>
-	<field5>string1</field5>
-	<field5>string2</field5>
-	<field6>true</field6>
-	<field6>false</field6>
-</top-level>
+<?xml version="1.0" encoding="UTF-8"?>
+<top-level xmlns="http://csrc.nist.gov/ns/metaschema/testing/simple/with/field" id="test">
+	<field>field-value</field>
+	<field2>
+		<p><b>bold</b> <i>italics</i>field2-markup1</p>
+		<p>field2-markup2</p>
+	</field2>
+	<field3>field-value3</field3>
+	<field4s>
+		<field4><p>markdown-string1<a href="url">link-text</a></p></field4>
+		<field4><p>markdown-string2</p></field4>
+	</field4s>
+	<field5>string1</field5>
+	<field5>string2</field5>
+	<field6>true</field6>
+	<field6>false</field6>
+</top-level>
diff --git a/databind/src/test/resources/metaschema/simple_with_field/metaschema.xml b/databind/src/test/resources/metaschema/simple_with_field/metaschema.xml
index 43104d4ac..ffe8d36cd 100644
--- a/databind/src/test/resources/metaschema/simple_with_field/metaschema.xml
+++ b/databind/src/test/resources/metaschema/simple_with_field/metaschema.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../../../../core/metaschema/schema/xml/metaschema.xsd"
- xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
-  <schema-name>Simple Metaschema</schema-name>
-  <schema-version>1.0</schema-version>
-  <short-name>simple</short-name>
-  <namespace>http://csrc.nist.gov/ns/metaschema/testing/simple/with/field</namespace>
-  <json-base-uri>http://csrc.nist.gov/ns/metaschema/testing/simple/with/field</json-base-uri>
-  
-  <define-assembly name="top-level">
-    <formal-name>Root</formal-name>
-    <description>Root assembly</description>
-    <root-name>top-level</root-name>
-    <flag ref="id"/>
-    <model>
-      <field ref="field" min-occurs="1"/>
-      <field ref="field2" min-occurs="1"/>
-      <field ref="field3" min-occurs="1"/>
-     
-      <field ref="field4" max-occurs="unbounded">
-        <group-as name="field4s" in-xml="GROUPED" in-json="SINGLETON_OR_ARRAY"/>
-      </field>
-      <field ref="field5" max-occurs="unbounded">
-        <group-as name="field5s" in-xml="UNGROUPED" in-json="SINGLETON_OR_ARRAY"/>
-      </field>
-      <field ref="field6" max-occurs="unbounded">
-        <group-as name="field6s" in-json="SINGLETON_OR_ARRAY"/>
-      </field>
-    </model>
-  </define-assembly>
-  
-  <define-flag name="id">
-    <formal-name>Identifier</formal-name>
-    <description>The document identifier</description>
-  </define-flag>
-  
-  <define-field name="field">
-    <formal-name>A Field</formal-name>
-    <description>A field with no flags.</description>
-    <json-value-key>text</json-value-key>
-  </define-field>
-  
-  <define-field name="field2" as-type="markup-multiline">
-    <formal-name>A Field</formal-name>
-    <description>A field with no flags.</description>
-    <json-value-key>text2</json-value-key>
-  </define-field>
-  
-  <define-field name="field3"><!--  as-type="markup-multiline" -->
-    <formal-name>A Field</formal-name>
-    <description>A field with no flags.</description>
-    <json-value-key>text3</json-value-key>
-  </define-field>
-  
-  <define-field name="field4" as-type="markup-multiline">
-    <formal-name>A Field</formal-name>
-    <description>A field with no flags.</description>
-    <json-value-key>text4</json-value-key>
-  </define-field>
-  
-  <define-field name="field5">
-    <formal-name>A Field</formal-name>
-    <description>A field with no flags.</description>
-    <json-value-key>text5</json-value-key>
-  </define-field>
-  
-  <define-field name="field6" as-type="boolean">
-    <formal-name>A Field</formal-name>
-    <description>A field with no flags.</description>
-  </define-field>
-  
-</METASCHEMA>
+<?xml version="1.0" encoding="UTF-8"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../../../../core/metaschema/schema/xml/metaschema.xsd"
+ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
+  <schema-name>Simple Metaschema</schema-name>
+  <schema-version>1.0</schema-version>
+  <short-name>simple</short-name>
+  <namespace>http://csrc.nist.gov/ns/metaschema/testing/simple/with/field</namespace>
+  <json-base-uri>http://csrc.nist.gov/ns/metaschema/testing/simple/with/field</json-base-uri>
+  
+  <define-assembly name="top-level">
+    <formal-name>Root</formal-name>
+    <description>Root assembly</description>
+    <root-name>top-level</root-name>
+    <flag ref="id"/>
+    <model>
+      <field ref="field" min-occurs="1"/>
+      <field ref="field2" min-occurs="1"/>
+      <field ref="field3" min-occurs="1"/>
+     
+      <field ref="field4" max-occurs="unbounded">
+        <group-as name="field4s" in-xml="GROUPED" in-json="SINGLETON_OR_ARRAY"/>
+      </field>
+      <field ref="field5" max-occurs="unbounded">
+        <group-as name="field5s" in-xml="UNGROUPED" in-json="SINGLETON_OR_ARRAY"/>
+      </field>
+      <field ref="field6" max-occurs="unbounded">
+        <group-as name="field6s" in-json="SINGLETON_OR_ARRAY"/>
+      </field>
+    </model>
+  </define-assembly>
+  
+  <define-flag name="id">
+    <formal-name>Identifier</formal-name>
+    <description>The document identifier</description>
+  </define-flag>
+  
+  <define-field name="field">
+    <formal-name>A Field</formal-name>
+    <description>A field with no flags.</description>
+    <json-value-key>text</json-value-key>
+  </define-field>
+  
+  <define-field name="field2" as-type="markup-multiline">
+    <formal-name>A Field</formal-name>
+    <description>A field with no flags.</description>
+    <json-value-key>text2</json-value-key>
+  </define-field>
+  
+  <define-field name="field3"><!--  as-type="markup-multiline" -->
+    <formal-name>A Field</formal-name>
+    <description>A field with no flags.</description>
+    <json-value-key>text3</json-value-key>
+  </define-field>
+  
+  <define-field name="field4" as-type="markup-multiline">
+    <formal-name>A Field</formal-name>
+    <description>A field with no flags.</description>
+    <json-value-key>text4</json-value-key>
+  </define-field>
+  
+  <define-field name="field5">
+    <formal-name>A Field</formal-name>
+    <description>A field with no flags.</description>
+    <json-value-key>text5</json-value-key>
+  </define-field>
+  
+  <define-field name="field6" as-type="boolean">
+    <formal-name>A Field</formal-name>
+    <description>A field with no flags.</description>
+  </define-field>
+  
+</METASCHEMA>
diff --git a/databind/src/test/resources/metaschema/simple_with_uuid/example.json b/databind/src/test/resources/metaschema/simple_with_uuid/example.json
index cec099441..05ee8596f 100644
--- a/databind/src/test/resources/metaschema/simple_with_uuid/example.json
+++ b/databind/src/test/resources/metaschema/simple_with_uuid/example.json
@@ -1,3 +1,3 @@
-{
-  "top-level": {"uuid": "5de455cf-2f8d-4da2-9182-323d433e1065"}
+{
+  "top-level": {"uuid": "5de455cf-2f8d-4da2-9182-323d433e1065"}
 }
\ No newline at end of file
diff --git a/databind/src/test/resources/metaschema/simple_with_uuid/example.xml b/databind/src/test/resources/metaschema/simple_with_uuid/example.xml
index 7bdb9252a..92beef6c6 100644
--- a/databind/src/test/resources/metaschema/simple_with_uuid/example.xml
+++ b/databind/src/test/resources/metaschema/simple_with_uuid/example.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<top-level xmlns="http://csrc.nist.gov/ns/metaschema/testing/simple/with/uuid" uuid="5de455cf-2f8d-4da2-9182-323d433e1065"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<top-level xmlns="http://csrc.nist.gov/ns/metaschema/testing/simple/with/uuid" uuid="5de455cf-2f8d-4da2-9182-323d433e1065"/>
diff --git a/databind/src/test/resources/metaschema/simple_with_uuid/metaschema.xml b/databind/src/test/resources/metaschema/simple_with_uuid/metaschema.xml
index d447fa58d..a7d57fdc1 100644
--- a/databind/src/test/resources/metaschema/simple_with_uuid/metaschema.xml
+++ b/databind/src/test/resources/metaschema/simple_with_uuid/metaschema.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../../../../core/metaschema/schema/xml/metaschema.xsd"
-  xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
-  <schema-name>Simple Metaschema</schema-name>
-  <schema-version>1.0</schema-version>
-  <short-name>simple</short-name>
-  <namespace>http://csrc.nist.gov/ns/metaschema/testing/simple/with/uuid</namespace>
-  <json-base-uri>http://csrc.nist.gov/ns/metaschema/testing/simple/with/uuid</json-base-uri>
-  
-  <define-assembly name="top-level">
-    <formal-name>Root</formal-name>
-    <description>Root assembly</description>
-    <root-name>top-level</root-name>
-    <flag ref="uuid" required="yes"/>
-    <model/>
-  </define-assembly>
-  
-  <define-flag name="uuid" as-type="uuid">
-      <formal-name>Universally Unique Identifier</formal-name>
-      <description>A RFC 4122 version 4 Universally Unique Identifier (UUID) for the containing object.</description>
-   </define-flag>
-</METASCHEMA>
+<?xml version="1.0" encoding="UTF-8"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../../../../core/metaschema/schema/xml/metaschema.xsd"
+  xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
+  <schema-name>Simple Metaschema</schema-name>
+  <schema-version>1.0</schema-version>
+  <short-name>simple</short-name>
+  <namespace>http://csrc.nist.gov/ns/metaschema/testing/simple/with/uuid</namespace>
+  <json-base-uri>http://csrc.nist.gov/ns/metaschema/testing/simple/with/uuid</json-base-uri>
+  
+  <define-assembly name="top-level">
+    <formal-name>Root</formal-name>
+    <description>Root assembly</description>
+    <root-name>top-level</root-name>
+    <flag ref="uuid" required="yes"/>
+    <model/>
+  </define-assembly>
+  
+  <define-flag name="uuid" as-type="uuid">
+      <formal-name>Universally Unique Identifier</formal-name>
+      <description>A RFC 4122 version 4 Universally Unique Identifier (UUID) for the containing object.</description>
+   </define-flag>
+</METASCHEMA>
diff --git a/metaschema-cli/pom.xml b/metaschema-cli/pom.xml
index d3d538961..2488ccfcf 100644
--- a/metaschema-cli/pom.xml
+++ b/metaschema-cli/pom.xml
@@ -35,6 +35,10 @@
 			<groupId>${project.groupId}</groupId>
 			<artifactId>metaschema-databind</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>metaschema-databind-modules</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>com.google.auto.service</groupId>
diff --git a/metaschema-cli/src/main/assembly/bin.xml b/metaschema-cli/src/main/assembly/bin.xml
index 3d5f551df..509e4af07 100644
--- a/metaschema-cli/src/main/assembly/bin.xml
+++ b/metaschema-cli/src/main/assembly/bin.xml
@@ -14,6 +14,10 @@
 			<outputDirectory>/lib</outputDirectory>
 			<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
 			<useProjectArtifact>true</useProjectArtifact>
+			<excludes>
+				<exclude>org.jetbrains:annotations</exclude>
+				<exclude>org.eclipse.jdt:org.eclipse.jdt.annotation</exclude>
+			</excludes>
 		</dependencySet>
 	</dependencySets>
 	<fileSets>
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/CLI.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/CLI.java
index 5e12fce1c..819615f9f 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/CLI.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/CLI.java
@@ -26,9 +26,7 @@
 
 package gov.nist.secauto.metaschema.cli;
 
-import gov.nist.secauto.metaschema.cli.commands.GenerateSchemaCommand;
-import gov.nist.secauto.metaschema.cli.commands.ValidateContentUsingModuleCommand;
-import gov.nist.secauto.metaschema.cli.commands.ValidateModuleCommand;
+import gov.nist.secauto.metaschema.cli.commands.MetaschemaCommands;
 import gov.nist.secauto.metaschema.cli.processor.CLIProcessor;
 import gov.nist.secauto.metaschema.cli.processor.ExitStatus;
 import gov.nist.secauto.metaschema.cli.processor.command.CommandService;
@@ -37,7 +35,8 @@
 import gov.nist.secauto.metaschema.core.util.IVersionInfo;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 
-import java.util.List;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -51,14 +50,15 @@ public static void main(String[] args) {
   public static ExitStatus runCli(String... args) {
     System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
 
-    List<IVersionInfo> versions = ObjectUtils.notNull(
-        List.of(
-            new MetaschemaJavaVersion(),
-            new MetaschemaVersion()));
+    Map<String, IVersionInfo> versions = ObjectUtils.notNull(
+        new LinkedHashMap<>() {
+          {
+            put(CLIProcessor.COMMAND_VERSION, new MetaschemaJavaVersion());
+            put("http://csrc.nist.gov/ns/oscal/metaschema/1.0", new MetaschemaVersion());
+          }
+        });
     CLIProcessor processor = new CLIProcessor("metaschema-cli", versions);
-    processor.addCommandHandler(new ValidateModuleCommand());
-    processor.addCommandHandler(new GenerateSchemaCommand());
-    processor.addCommandHandler(new ValidateContentUsingModuleCommand());
+    MetaschemaCommands.COMMANDS.forEach(processor::addCommandHandler);
 
     CommandService.getInstance().getCommands().stream().forEach(command -> {
       assert command != null;
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractConvertSubcommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractConvertSubcommand.java
index e893e46f1..80b2031fa 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractConvertSubcommand.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractConvertSubcommand.java
@@ -37,6 +37,7 @@
 import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument;
 import gov.nist.secauto.metaschema.core.util.CustomCollectors;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
+import gov.nist.secauto.metaschema.core.util.UriUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
 import gov.nist.secauto.metaschema.databind.io.Format;
 import gov.nist.secauto.metaschema.databind.io.IBoundLoader;
@@ -46,10 +47,17 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
@@ -64,8 +72,8 @@ public abstract class AbstractConvertSubcommand
   private static final String COMMAND = "convert";
   @NonNull
   private static final List<ExtraArgument> EXTRA_ARGUMENTS = ObjectUtils.notNull(List.of(
-      new DefaultExtraArgument("source file", true),
-      new DefaultExtraArgument("destination file", false)));
+      new DefaultExtraArgument("source-file-or-URL", true),
+      new DefaultExtraArgument("destination-file", false)));
 
   @NonNull
   private static final Option OVERWRITE_OPTION = ObjectUtils.notNull(
@@ -121,14 +129,6 @@ public void validateOptions(CallingContext callingContext, CommandLine cmdLine)
     if (extraArgs.isEmpty() || extraArgs.size() > 2) {
       throw new InvalidArgumentException("Illegal number of arguments.");
     }
-
-    Path source = Paths.get(extraArgs.get(0));
-    if (!Files.exists(source)) {
-      throw new InvalidArgumentException("The provided source '" + source + "' does not exist.");
-    }
-    if (!Files.isReadable(source)) {
-      throw new InvalidArgumentException("The provided source '" + source + "' is not readable.");
-    }
   }
 
   protected abstract static class AbstractConversionCommandExecutor
@@ -143,9 +143,6 @@ public AbstractConversionCommandExecutor(
     @NonNull
     protected abstract IBindingContext getBindingContext();
 
-    @NonNull
-    protected abstract Class<?> getLoadedClass();
-
     @SuppressWarnings({
         "PMD.OnlyOneReturn", // readability
         "PMD.CyclomaticComplexity", "PMD.CognitiveComplexity" // reasonable
@@ -185,7 +182,15 @@ public ExitStatus execute() {
         }
       }
 
-      Path source = Paths.get(extraArgs.get(0));
+      String sourceName = extraArgs.get(0);
+      URI source;
+      URI cwd = Paths.get("").toAbsolutePath().toUri();
+      try {
+        source = UriUtils.toUri(sourceName, cwd);
+      } catch (URISyntaxException ex) {
+        return ExitCode.IO_ERROR.exitMessage("Cannot load source '%s' as it is not a valid file or URI.")
+            .withThrowable(ex);
+      }
       assert source != null;
 
       String toFormatText = cmdLine.getOptionValue(TO_OPTION);
@@ -199,9 +204,19 @@ public ExitStatus execute() {
         }
 
         if (destination == null) {
-          loader.convert(source, ObjectUtils.notNull(System.out), toFormat, getLoadedClass());
+          // write to STDOUT
+          OutputStreamWriter writer = new OutputStreamWriter(System.out, StandardCharsets.UTF_8);
+          handleConversion(source, toFormat, writer, loader);
         } else {
-          loader.convert(source, destination, toFormat, getLoadedClass());
+          try (Writer writer = Files.newBufferedWriter(
+              destination,
+              StandardCharsets.UTF_8,
+              StandardOpenOption.CREATE,
+              StandardOpenOption.WRITE,
+              StandardOpenOption.TRUNCATE_EXISTING)) {
+            assert writer != null;
+            handleConversion(source, toFormat, writer, loader);
+          }
         }
       } catch (IOException | IllegalArgumentException ex) {
         return ExitCode.PROCESSING_ERROR.exit().withThrowable(ex); // NOPMD readability
@@ -212,5 +227,10 @@ public ExitStatus execute() {
       return ExitCode.OK.exit();
     }
 
+    protected abstract void handleConversion(
+        @NonNull URI source,
+        @NonNull Format toFormat,
+        @NonNull Writer writer,
+        @NonNull IBoundLoader loader) throws FileNotFoundException, IOException;
   }
 }
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java
index 170e72d6e..85dedaf36 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/AbstractValidateContentCommand.java
@@ -37,32 +37,37 @@
 import gov.nist.secauto.metaschema.cli.processor.command.DefaultExtraArgument;
 import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument;
 import gov.nist.secauto.metaschema.cli.util.LoggingValidationHandler;
+import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration;
+import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
+import gov.nist.secauto.metaschema.core.metapath.MetapathException;
 import gov.nist.secauto.metaschema.core.model.IConstraintLoader;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet;
+import gov.nist.secauto.metaschema.core.model.constraint.ValidationFeature;
 import gov.nist.secauto.metaschema.core.model.validation.IValidationResult;
 import gov.nist.secauto.metaschema.core.util.CollectionUtil;
 import gov.nist.secauto.metaschema.core.util.CustomCollectors;
+import gov.nist.secauto.metaschema.core.util.IVersionInfo;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.core.util.UriUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
-import gov.nist.secauto.metaschema.databind.IBindingContext.IValidationSchemaProvider;
+import gov.nist.secauto.metaschema.databind.IBindingContext.ISchemaValidationProvider;
 import gov.nist.secauto.metaschema.databind.io.Format;
-import gov.nist.secauto.metaschema.databind.io.FormatDetector;
 import gov.nist.secauto.metaschema.databind.io.IBoundLoader;
 import gov.nist.secauto.metaschema.databind.model.metaschema.BindingConstraintLoader;
+import gov.nist.secauto.metaschema.modules.sarif.SarifValidationHandler;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.xml.sax.SAXException;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collection;
@@ -80,7 +85,7 @@ public abstract class AbstractValidateContentCommand
   private static final String COMMAND = "validate";
   @NonNull
   private static final List<ExtraArgument> EXTRA_ARGUMENTS = ObjectUtils.notNull(List.of(
-      new DefaultExtraArgument("file to validate", true)));
+      new DefaultExtraArgument("file-or-URI-to-validate", true)));
 
   @NonNull
   private static final Option AS_OPTION = ObjectUtils.notNull(
@@ -89,14 +94,29 @@ public abstract class AbstractValidateContentCommand
           .hasArg()
           .argName("FORMAT")
           .desc("source format: xml, json, or yaml")
+          .numberOfArgs(1)
           .build());
   @NonNull
   private static final Option CONSTRAINTS_OPTION = ObjectUtils.notNull(
       Option.builder("c")
-          .hasArg()
+          .hasArgs()
           .argName("URI")
           .desc("additional constraint definitions")
           .build());
+  @NonNull
+  private static final Option SARIF_OUTPUT_FILE_OPTION = ObjectUtils.notNull(
+      Option.builder("o")
+          .hasArg()
+          .argName("FILE")
+          .desc("write SARIF results to the provided FILE")
+          .numberOfArgs(1)
+          .build());
+  @NonNull
+  private static final Option SARIF_INCLUDE_PASS_OPTION = ObjectUtils.notNull(
+      Option.builder()
+          .longOpt("sarif-include-pass")
+          .desc("include pass results in SARIF")
+          .build());
 
   @Override
   public String getName() {
@@ -108,7 +128,9 @@ public String getName() {
   public Collection<? extends Option> gatherOptions() {
     return List.of(
         AS_OPTION,
-        CONSTRAINTS_OPTION);
+        CONSTRAINTS_OPTION,
+        SARIF_OUTPUT_FILE_OPTION,
+        SARIF_INCLUDE_PASS_OPTION);
   }
 
   @Override
@@ -143,7 +165,7 @@ public void validateOptions(CallingContext callingContext, CommandLine cmdLine)
 
   protected abstract class AbstractValidationCommandExecutor
       extends AbstractCommandExecutor
-      implements IValidationSchemaProvider {
+      implements ISchemaValidationProvider {
 
     public AbstractValidationCommandExecutor(
         @NonNull CallingContext callingContext,
@@ -170,7 +192,7 @@ public ExitStatus execute() {
           try {
             URI constraintUri = ObjectUtils.requireNonNull(UriUtils.toUri(arg, cwd));
             constraintSets.add(constraintLoader.load(constraintUri));
-          } catch (IOException | MetaschemaException | URISyntaxException ex) {
+          } catch (IOException | MetaschemaException | MetapathException | URISyntaxException ex) {
             return ExitCode.IO_ERROR.exitMessage("Unable to load constraint set '" + arg + "'.").withThrowable(ex);
           }
         }
@@ -189,7 +211,7 @@ public ExitStatus execute() {
       IBoundLoader loader = bindingContext.newBoundLoader();
 
       List<String> extraArgs = cmdLine.getArgList();
-      // @SuppressWarnings("null")
+
       String sourceName = extraArgs.get(0);
       URI source;
 
@@ -215,9 +237,8 @@ public ExitStatus execute() {
         }
       } else {
         // attempt to determine the format
-        FormatDetector.Result formatResult;
         try {
-          formatResult = loader.detectFormat(source);
+          asFormat = loader.detectFormat(source);
         } catch (FileNotFoundException ex) {
           // this case was already checked for
           return ExitCode.IO_ERROR.exitMessage("The provided source file '" + source + "' does not exist.");
@@ -230,38 +251,60 @@ public ExitStatus execute() {
                       .map(format -> format.name())
                       .collect(CustomCollectors.joiningWithOxfordComma("or")));
         }
-        asFormat = formatResult.getFormat();
       }
 
       if (LOGGER.isInfoEnabled()) {
         LOGGER.info("Validating '{}' as {}.", source, asFormat.name());
       }
 
+      IMutableConfiguration<ValidationFeature<?>> configuration = new DefaultConfiguration<>();
+      if (cmdLine.hasOption(SARIF_OUTPUT_FILE_OPTION) && cmdLine.hasOption(SARIF_INCLUDE_PASS_OPTION)) {
+        configuration.enableFeature(ValidationFeature.VALIDATE_GENERATE_PASS_FINDINGS);
+      }
+
       IValidationResult validationResult;
       try {
-        validationResult = bindingContext.validate(source, asFormat, this);
+        validationResult = bindingContext.validate(source, asFormat, this, configuration);
       } catch (FileNotFoundException ex) {
         return ExitCode.IO_ERROR.exitMessage(String.format("Resource not found at '%s'", source)).withThrowable(ex);
 
       } catch (UnknownHostException ex) {
         return ExitCode.IO_ERROR.exitMessage(String.format("Unknown host for '%s'.", source)).withThrowable(ex);
 
-      } catch (IOException | SAXException ex) {
+      } catch (IOException ex) {
+        return ExitCode.IO_ERROR.exit().withThrowable(ex);
+      } catch (MetapathException ex) {
         return ExitCode.PROCESSING_ERROR.exit().withThrowable(ex);
       }
 
-      if (LOGGER.isInfoEnabled()) {
-        LOGGER.info("Validation identified the following in file '{}'.", source);
-      }
+      if (cmdLine.hasOption(SARIF_OUTPUT_FILE_OPTION) && LOGGER.isInfoEnabled()) {
+        Path sarifFile = Paths.get(cmdLine.getOptionValue(SARIF_OUTPUT_FILE_OPTION));
+
+        IVersionInfo version
+            = getCallingContext().getCLIProcessor().getVersionInfos().get(CLIProcessor.COMMAND_VERSION);
+
+        try {
+          SarifValidationHandler sarifHandler = new SarifValidationHandler(source, version);
+          sarifHandler.addFindings(validationResult.getFindings());
+          sarifHandler.write(sarifFile);
+        } catch (IOException ex) {
+          return ExitCode.IO_ERROR.exit().withThrowable(ex);
+        }
+      } else if (!validationResult.isPassing()) {
+        LOGGER.info("Validation identified the following issues:", source);
 
-      LoggingValidationHandler.instance().handleValidationResults(validationResult);
+        LoggingValidationHandler.instance().handleValidationResults(validationResult);
+      }
 
-      if (validationResult.isPassing() && !cmdLine.hasOption(CLIProcessor.QUIET_OPTION) && LOGGER.isInfoEnabled()) {
-        LOGGER.info("The file '{}' is valid.", source);
+      if (validationResult.isPassing()) {
+        if (LOGGER.isInfoEnabled()) {
+          LOGGER.info("The file '{}' is valid.", source);
+        }
+      } else if (LOGGER.isErrorEnabled()) {
+        LOGGER.error("The file '{}' is invalid.", source);
       }
 
       return (validationResult.isPassing() ? ExitCode.OK : ExitCode.FAIL).exit();
     }
-
   }
 }
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java
index 2a03cac40..101903ecd 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java
@@ -99,7 +99,7 @@ public class GenerateSchemaCommand
 
   static {
     EXTRA_ARGUMENTS = ObjectUtils.notNull(List.of(
-        new DefaultExtraArgument("metaschema-module-file", true),
+        new DefaultExtraArgument("metaschema-module-file-or-URL", true),
         new DefaultExtraArgument("destination-schema-file", false)));
   }
 
@@ -166,7 +166,6 @@ protected ExitStatus executeCommand(
       @NonNull CallingContext callingContext,
       @NonNull CommandLine cmdLine) {
     List<String> extraArgs = cmdLine.getArgList();
-    URI cwd = Paths.get("").toAbsolutePath().toUri();
 
     Path destination = null;
     if (extraArgs.size() > 1) {
@@ -212,6 +211,7 @@ protected ExitStatus executeCommand(
 
     URI input;
     String inputName = extraArgs.get(0);
+    URI cwd = Paths.get("").toAbsolutePath().toUri();
 
     try {
       input = UriUtils.toUri(extraArgs.get(0), cwd);
diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionAssembly.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/MetaschemaCommands.java
similarity index 76%
rename from databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionAssembly.java
rename to metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/MetaschemaCommands.java
index c2f90fe47..54c1d3288 100644
--- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/metaschema/IBindingDefinitionAssembly.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/MetaschemaCommands.java
@@ -24,15 +24,21 @@
  * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
  */
 
-package gov.nist.secauto.metaschema.databind.model.metaschema;
+package gov.nist.secauto.metaschema.cli.commands;
 
-import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
+import gov.nist.secauto.metaschema.cli.commands.metapath.MetapathCommand;
+import gov.nist.secauto.metaschema.cli.processor.command.ICommand;
 
-public interface IBindingDefinitionAssembly
-    extends IAssemblyDefinition, IBindingDefinitionModel, IBindingContainerModelAssembly {
+import java.util.List;
 
-  @Override
-  default IBindingDefinitionAssembly getOwningDefinition() {
-    return this;
+public final class MetaschemaCommands {
+  public static final List<ICommand> COMMANDS = List.of(
+      new ValidateModuleCommand(),
+      new GenerateSchemaCommand(),
+      new ValidateContentUsingModuleCommand(),
+      new MetapathCommand());
+
+  private MetaschemaCommands() {
+    // disable construction
   }
 }
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java
index d65db67e2..86b4b3b5d 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java
@@ -54,6 +54,7 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -115,7 +116,7 @@ public ICommandExecutor newExecutor(CallingContext callingContext, CommandLine c
     return new OscalCommandExecutor(callingContext, commandLine);
   }
 
-  private class OscalCommandExecutor
+  private final class OscalCommandExecutor
       extends AbstractValidationCommandExecutor {
 
     private Path tempDir;
@@ -181,7 +182,7 @@ protected IBindingContext getBindingContext(@NonNull Set<IConstraintSet> constra
     }
 
     @Override
-    public List<Source> getXmlSchemas() throws IOException {
+    public List<Source> getXmlSchemas(@NonNull URL targetResource) throws IOException {
       Path schemaFile = Files.createTempFile(getTempDir(), "schema-", ".xml");
       assert schemaFile != null;
       IMutableConfiguration<SchemaGenerationFeature<?>> configuration = new DefaultConfiguration<>();
@@ -191,7 +192,7 @@ public List<Source> getXmlSchemas() throws IOException {
     }
 
     @Override
-    public JSONObject getJsonSchema() throws IOException {
+    public JSONObject getJsonSchema(@NonNull JSONObject json) throws IOException {
       Path schemaFile = Files.createTempFile(getTempDir(), "schema-", ".json");
       assert schemaFile != null;
       IMutableConfiguration<SchemaGenerationFeature<?>> configuration = new DefaultConfiguration<>();
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java
new file mode 100644
index 000000000..4ee7db43e
--- /dev/null
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java
@@ -0,0 +1,132 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.cli.commands.metapath;
+
+import gov.nist.secauto.metaschema.cli.processor.CLIProcessor.CallingContext;
+import gov.nist.secauto.metaschema.cli.processor.ExitCode;
+import gov.nist.secauto.metaschema.cli.processor.ExitStatus;
+import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand;
+import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor;
+import gov.nist.secauto.metaschema.core.metapath.StaticContext;
+import gov.nist.secauto.metaschema.core.metapath.function.FunctionService;
+import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
+import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+public class ListFunctionsSubcommand
+    extends AbstractTerminalCommand {
+  private static final Logger LOGGER = LogManager.getLogger(ListFunctionsSubcommand.class);
+
+  @NonNull
+  private static final String COMMAND = "list-functions";
+
+  @Override
+  public String getName() {
+    return COMMAND;
+  }
+
+  @Override
+  public String getDescription() {
+    return "Get a listing of supported Metapath functions";
+  }
+
+  @Override
+  public ICommandExecutor newExecutor(CallingContext callingContext, CommandLine cmdLine) {
+    return ICommandExecutor.using(callingContext, cmdLine, this::executeCommand);
+  }
+
+  @SuppressWarnings({
+      "PMD.OnlyOneReturn", // readability
+      "unused"
+  })
+  protected ExitStatus executeCommand(
+      @NonNull CallingContext callingContext,
+      @NonNull CommandLine cmdLine) {
+
+    Map<String, Map<String, List<IFunction>>> namespaceToNameToFunctionMap = FunctionService.getInstance().stream()
+        .collect(Collectors.groupingBy(
+            IFunction::getNamespace,
+            Collectors.groupingBy(
+                IFunction::getName,
+                Collectors.toList())));
+
+    Map<String, String> namespaceToPrefixMap = StaticContext.getWellKnownNamespacesMap().entrySet().stream()
+        .collect(Collectors.toMap(entry -> entry.getValue().toASCIIString(), Map.Entry::getKey));
+
+    List<String> namespaces = new ArrayList<>(namespaceToNameToFunctionMap.keySet());
+
+    Collections.sort(namespaces);
+
+    for (String namespace : namespaces) {
+      String prefix = namespaceToPrefixMap.get(namespace);
+
+      if (prefix == null) {
+        LOGGER.atInfo().log("In namespace '{}':", namespace);
+      } else {
+        LOGGER.atInfo().log("In namespace '{}' as '{}':", namespace, prefix);
+      }
+
+      Map<String, List<IFunction>> namespacedFunctions = namespaceToNameToFunctionMap.get(namespace);
+
+      List<String> names = new ArrayList<>(namespacedFunctions.keySet());
+      Collections.sort(names);
+
+      for (String name : names) {
+        List<IFunction> functions = namespacedFunctions.get(name);
+        Collections.sort(functions, Comparator.comparing(IFunction::arity));
+
+        for (IFunction function : functions) {
+          String functionRef = prefix == null
+              ? String.format("Q{%s}%s", function.getNamespace(), function.getName())
+              : String.format("%s:%s", prefix, function.getName());
+
+          LOGGER.atInfo().log(String.format("%s(%s) as %s",
+              functionRef,
+              function.getArguments().isEmpty()
+                  ? ""
+                  : function.getArguments().stream().map(IArgument::toSignature)
+                      .collect(Collectors.joining(","))
+                      + (function.isArityUnbounded() ? ", ..." : ""),
+              function.getResult().toSignature()));
+        }
+      }
+    }
+    return ExitCode.OK.exit();
+  }
+}
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/MetapathCommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/MetapathCommand.java
new file mode 100644
index 000000000..b4496660f
--- /dev/null
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/metapath/MetapathCommand.java
@@ -0,0 +1,49 @@
+/*
+ * Portions of this software was developed by employees of the National Institute
+ * of Standards and Technology (NIST), an agency of the Federal Government and is
+ * being made available as a public service. Pursuant to title 17 United States
+ * Code Section 105, works of NIST employees are not subject to copyright
+ * protection in the United States. This software may be subject to foreign
+ * copyright. Permission in the United States and in foreign countries, to the
+ * extent that NIST may hold copyright, to use, copy, modify, create derivative
+ * works, and distribute this software and its documentation without fee is hereby
+ * granted on a non-exclusive basis, provided that this notice and disclaimer
+ * of warranty appears in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
+ * THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
+ * INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
+ * SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE.  IN NO EVENT
+ * SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
+ * INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
+ * OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
+ * CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
+ * PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
+ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
+ */
+
+package gov.nist.secauto.metaschema.cli.commands.metapath;
+
+import gov.nist.secauto.metaschema.cli.processor.command.AbstractParentCommand;
+
+public class MetapathCommand
+    extends AbstractParentCommand {
+  private static final String COMMAND = "metapath";
+
+  public MetapathCommand() {
+    super(true);
+    addCommandHandler(new ListFunctionsSubcommand());
+  }
+
+  @Override
+  public String getName() {
+    return COMMAND;
+  }
+
+  @Override
+  public String getDescription() {
+    return "Perform a Metapath operation.";
+  }
+}
diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java
index 5c6e094e5..e0f9e8338 100644
--- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java
+++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java
@@ -42,9 +42,11 @@
 import org.fusesource.jansi.Ansi.Color;
 import org.xml.sax.SAXParseException;
 
+import java.net.URI;
 import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public final class LoggingValidationHandler {
   private static final Logger LOGGER = LogManager.getLogger(LoggingValidationHandler.class);
@@ -58,11 +60,13 @@ public static LoggingValidationHandler instance() {
     return instance(false);
   }
 
+  @SuppressFBWarnings(value = "SING_SINGLETON_GETTER_NOT_SYNCHRONIZED",
+      justification = "both values are class initialized")
   public static LoggingValidationHandler instance(boolean logExceptions) {
     return logExceptions ? LOG_EXCPTION_INSTANCE : NO_LOG_EXCPTION_INSTANCE;
   }
 
-  protected LoggingValidationHandler(boolean logExceptions) {
+  private LoggingValidationHandler(boolean logExceptions) {
     this.logExceptions = logExceptions;
   }
 
@@ -92,27 +96,37 @@ public void handleValidationFindings(@NonNull List<? extends IValidationFinding>
   private void handleJsonValidationFinding(@NonNull JsonValidationFinding finding) {
     Ansi ansi = generatePreamble(finding.getSeverity());
 
-    getLogger(finding).log(
-        ansi.a('[')
-            .fgBright(Color.WHITE)
-            .a(finding.getCause().getPointerToViolation())
-            .reset()
-            .a(']')
-            .format(" %s [%s]",
-                finding.getMessage(),
-                finding.getDocumentUri().toString()));
+    ansi = ansi.a('[')
+        .fgBright(Color.WHITE)
+        .a(finding.getCause().getPointerToViolation())
+        .reset()
+        .a(']');
+
+    URI documentUri = finding.getDocumentUri();
+    ansi = documentUri == null
+        ? ansi.format(" %s", finding.getMessage())
+        : ansi.format(" %s [%s]", finding.getMessage(), documentUri.toString());
+
+    getLogger(finding).log(ansi);
   }
 
   private void handleXmlValidationFinding(XmlValidationFinding finding) {
     Ansi ansi = generatePreamble(finding.getSeverity());
     SAXParseException ex = finding.getCause();
 
-    getLogger(finding).log(
-        ansi.format("%s [%s{%d,%d}]",
+    URI documentUri = finding.getDocumentUri();
+    ansi = documentUri == null
+        ? ansi.format("%s [{%d,%d}]",
             finding.getMessage(),
-            finding.getDocumentUri().toString(),
             ex.getLineNumber(),
-            ex.getColumnNumber()));
+            ex.getColumnNumber())
+        : ansi.format("%s [%s{%d,%d}]",
+            finding.getMessage(),
+            documentUri.toString(),
+            ex.getLineNumber(),
+            ex.getColumnNumber());
+
+    getLogger(finding).log(ansi);
   }
 
   private void handleConstraintValidationFinding(@NonNull ConstraintValidationFinding finding) {
diff --git a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java b/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java
index 97c44158f..9d25ba8ad 100644
--- a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java
+++ b/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java
@@ -47,7 +47,7 @@
  * Unit test for simple CLI.
  */
 public class CLITest {
-  private static final ExitCode NO_EXPECTION_CLASS = null;
+  private static final ExitCode NO_EXCEPTION_CLASS = null;
 
   void evaluateResult(@NonNull ExitStatus status, @NonNull ExitCode expectedCode) {
     status.generateMessage(true);
@@ -65,7 +65,6 @@ void evaluateResult(@NonNull ExitStatus status, @NonNull ExitCode expectedCode,
   }
 
   private static Stream<Arguments> providesValues() {
-    ExitCode NO_EXCEPTION_CLASS = null;
     List<Arguments> values = new LinkedList<>() {
       {
         add(Arguments.of(new String[] {}, ExitCode.INVALID_COMMAND, NO_EXCEPTION_CLASS));
@@ -142,6 +141,9 @@ private static Stream<Arguments> providesValues() {
                 "--as=xml"
             },
             ExitCode.IO_ERROR, java.io.FileNotFoundException.class));
+        add(Arguments.of(
+            new String[] { "metapath", "list-functions" },
+            ExitCode.OK, NO_EXCEPTION_CLASS));
       }
     };
 
diff --git a/metaschema-maven-plugin/src/it/generate-sources/pom.xml b/metaschema-maven-plugin/src/it/generate-sources/pom.xml
index a2b607d30..8bf277001 100644
--- a/metaschema-maven-plugin/src/it/generate-sources/pom.xml
+++ b/metaschema-maven-plugin/src/it/generate-sources/pom.xml
@@ -38,7 +38,7 @@
                         <configuration>
                             <metaschemaDir>../../../../core/metaschema/schema/metaschema</metaschemaDir>
                             <includes>
-                                <include>*-metaschema.xml</include>
+                                <include>metaschema-module-metaschema.xml</include>
                             </includes>
                             <constraints>
                                 <constraint>../../../../core/metaschema/schema/metaschema/metaschema-module-constraints.xml</constraint>
diff --git a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java b/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java
index 915476880..12d9f2071 100644
--- a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java
+++ b/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java
@@ -227,10 +227,14 @@ protected final String getEncoding() {
     if (this.encoding != null) {
       // first try to use the provided encoding
       encoding = this.encoding;
-      getLog().debug(String.format("Using configured encoding [%s].", encoding));
+      if (getLog().isDebugEnabled()) {
+        getLog().debug(String.format("Using configured encoding [%s].", encoding));
+      }
     } else {
       encoding = System.getProperty(SYSTEM_FILE_ENCODING_PROPERTY);
-      getLog().warn(String.format("Using system encoding [%s]. This build is platform dependent!", encoding));
+      if (getLog().isWarnEnabled()) {
+        getLog().warn(String.format("Using system encoding [%s]. This build is platform dependent!", encoding));
+      }
     }
     return encoding;
   }
@@ -304,7 +308,9 @@ protected boolean isGenerationRequired() {
     final File staleFile = getStaleFile();
     boolean generate = !staleFile.exists();
     if (generate) {
-      getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
+      if (getLog().isInfoEnabled()) {
+        getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
+      }
       generate = true;
     } else {
       generate = false;
@@ -315,13 +321,17 @@ protected boolean isGenerationRequired() {
       URI metaschemaDirRelative = getMavenProject().getBasedir().toURI().relativize(metaschemaDir.toURI());
 
       if (buildContext.isIncremental() && buildContext.hasDelta(metaschemaDirRelative.toString())) {
-        getLog().info("metaschemaDirRelative: " + metaschemaDirRelative.toString());
+        if (getLog().isInfoEnabled()) {
+          getLog().info("metaschemaDirRelative: " + metaschemaDirRelative.toString());
+        }
         generate = true;
       }
 
       if (!generate) {
         for (File sourceFile : getModuleSources().collect(Collectors.toList())) {
-          getLog().info("Source file: " + sourceFile.getPath());
+          if (getLog().isInfoEnabled()) {
+            getLog().info("Source file: " + sourceFile.getPath());
+          }
           if (sourceFile.lastModified() > staleLastModified) {
             generate = true;
           }
diff --git a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java b/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java
index 076ea2170..d681ad2f5 100644
--- a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java
+++ b/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java
@@ -193,11 +193,12 @@ protected void generate(@NonNull Set<IModule> modules) throws MojoExecutionExcep
 
     Path outputDirectory = ObjectUtils.notNull(getOutputDirectory().toPath());
     for (IModule module : modules) {
-      getLog().info(String.format("Processing metaschema: %s", module.getLocation()));
+      if (getLog().isInfoEnabled()) {
+        getLog().info(String.format("Processing metaschema: %s", module.getLocation()));
+      }
       if (module.getExportedRootAssemblyDefinitions().isEmpty()) {
         continue;
       }
-
       generateSchemas(module, schemaGenerationConfig, outputDirectory, schemaFormats);
     }
   }
@@ -252,23 +253,31 @@ public void execute() throws MojoExecutionException {
     try {
       staleFile = staleFile.getCanonicalFile();
     } catch (IOException ex) {
-      getLog().warn("Unable to resolve canonical path to stale file. Treating it as not existing.", ex);
+      if (getLog().isWarnEnabled()) {
+        getLog().warn("Unable to resolve canonical path to stale file. Treating it as not existing.", ex);
+      }
     }
 
     boolean generate;
     if (shouldExecutionBeSkipped()) {
-      getLog().debug(String.format("Schema generation is configured to be skipped. Skipping."));
+      if (getLog().isDebugEnabled()) {
+        getLog().debug(String.format("Schema generation is configured to be skipped. Skipping."));
+      }
       generate = false;
     } else if (staleFile.exists()) {
       generate = isGenerationRequired();
     } else {
-      getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
+      if (getLog().isInfoEnabled()) {
+        getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
+      }
       generate = true;
     }
 
     if (generate) {
       File outputDir = getOutputDirectory();
-      getLog().debug(String.format("Using outputDirectory: %s", outputDir.getPath()));
+      if (getLog().isDebugEnabled()) {
+        getLog().debug(String.format("Using outputDirectory: %s", outputDir.getPath()));
+      }
 
       if (!outputDir.exists() && !outputDir.mkdirs()) {
         throw new MojoExecutionException("Unable to create output directory: " + outputDir);
@@ -289,7 +298,9 @@ public void execute() throws MojoExecutionException {
       loader.allowEntityResolution();
       final Set<IModule> modules = new HashSet<>();
       for (File source : getModuleSources().collect(Collectors.toList())) {
-        getLog().info("Using metaschema source: " + source.getPath());
+        if (getLog().isInfoEnabled()) {
+          getLog().info("Using metaschema source: " + source.getPath());
+        }
         IModule module;
         try {
           module = loader.load(source);
@@ -309,7 +320,9 @@ public void execute() throws MojoExecutionException {
           = Files.newOutputStream(staleFile.toPath(), StandardOpenOption.CREATE, StandardOpenOption.WRITE,
               StandardOpenOption.TRUNCATE_EXISTING)) {
         os.close();
-        getLog().info("Created stale file: " + staleFile);
+        if (getLog().isInfoEnabled()) {
+          getLog().info("Created stale file: " + staleFile);
+        }
       } catch (IOException ex) {
         throw new MojoExecutionException("Failed to write stale file: " + staleFile.getPath(), ex);
       }
diff --git a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSourcesMojo.java b/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSourcesMojo.java
index 8f7661a71..70336a65c 100644
--- a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSourcesMojo.java
+++ b/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSourcesMojo.java
@@ -111,7 +111,9 @@ protected void generate(@NonNull Set<IModule> modules) throws MojoExecutionExcep
     DefaultBindingConfiguration bindingConfiguration = new DefaultBindingConfiguration();
     for (File config : getConfigs()) {
       try {
-        getLog().info("Loading binding configuration: " + config.getPath());
+        if (getLog().isInfoEnabled()) {
+          getLog().info("Loading binding configuration: " + config.getPath());
+        }
         bindingConfiguration.load(config);
       } catch (IOException ex) {
         throw new MojoExecutionException(
@@ -120,7 +122,9 @@ protected void generate(@NonNull Set<IModule> modules) throws MojoExecutionExcep
     }
 
     try {
-      getLog().info("Generating Java classes in: " + getOutputDirectory().getPath());
+      if (getLog().isInfoEnabled()) {
+        getLog().info("Generating Java classes in: " + getOutputDirectory().getPath());
+      }
       JavaGenerator.generate(modules, ObjectUtils.notNull(getOutputDirectory().toPath()),
           bindingConfiguration);
     } catch (IOException ex) {
@@ -134,15 +138,21 @@ public void execute() throws MojoExecutionException {
     try {
       staleFile = staleFile.getCanonicalFile();
     } catch (IOException ex) {
-      getLog().warn("Unable to resolve canonical path to stale file. Treating it as not existing.", ex);
+      if (getLog().isWarnEnabled()) {
+        getLog().warn("Unable to resolve canonical path to stale file. Treating it as not existing.", ex);
+      }
     }
 
     boolean generate;
     if (shouldExecutionBeSkipped()) {
-      getLog().debug(String.format("Source file generation is configured to be skipped. Skipping."));
+      if (getLog().isDebugEnabled()) {
+        getLog().debug(String.format("Source file generation is configured to be skipped. Skipping."));
+      }
       generate = false;
     } else if (!staleFile.exists()) {
-      getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
+      if (getLog().isInfoEnabled()) {
+        getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
+      }
       generate = true;
     } else {
       generate = isGenerationRequired();
@@ -151,12 +161,12 @@ public void execute() throws MojoExecutionException {
     if (generate) {
 
       File outputDir = getOutputDirectory();
-      getLog().debug(String.format("Using outputDirectory: %s", outputDir.getPath()));
+      if (getLog().isDebugEnabled()) {
+        getLog().debug(String.format("Using outputDirectory: %s", outputDir.getPath()));
+      }
 
-      if (!outputDir.exists()) {
-        if (!outputDir.mkdirs()) {
-          throw new MojoExecutionException("Unable to create output directory: " + outputDir);
-        }
+      if (!outputDir.exists() && !outputDir.mkdirs()) {
+        throw new MojoExecutionException("Unable to create output directory: " + outputDir);
       }
 
       List<IConstraintSet> constraints;
@@ -174,7 +184,9 @@ public void execute() throws MojoExecutionException {
       loader.allowEntityResolution();
       final Set<IModule> modules = new HashSet<>();
       for (File source : getModuleSources().collect(Collectors.toList())) {
-        getLog().info("Using metaschema source: " + source.getPath());
+        if (getLog().isInfoEnabled()) {
+          getLog().info("Using metaschema source: " + source.getPath());
+        }
         IModule module;
         try {
           module = loader.load(source);
@@ -187,16 +199,16 @@ public void execute() throws MojoExecutionException {
       generate(modules);
 
       // create the stale file
-      if (!staleFileDirectory.exists()) {
-        if (!staleFileDirectory.mkdirs()) {
-          throw new MojoExecutionException("Unable to create output directory: " + staleFileDirectory);
-        }
+      if (!staleFileDirectory.exists() && !staleFileDirectory.mkdirs()) {
+        throw new MojoExecutionException("Unable to create output directory: " + staleFileDirectory);
       }
       try (OutputStream os
           = Files.newOutputStream(staleFile.toPath(), StandardOpenOption.CREATE, StandardOpenOption.WRITE,
               StandardOpenOption.TRUNCATE_EXISTING)) {
         os.close();
-        getLog().info("Created stale file: " + staleFile);
+        if (getLog().isInfoEnabled()) {
+          getLog().info("Created stale file: " + staleFile);
+        }
       } catch (IOException ex) {
         throw new MojoExecutionException("Failed to write stale file: " + staleFile.getPath(), ex);
       }
diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java b/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java
index d5373ec04..1944bc22a 100644
--- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java
+++ b/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java
@@ -140,30 +140,27 @@ private Stream<DynamicNode> generateTests() throws XmlException, IOException {
   protected void deleteCollectionOnExit(Path path) {
     if (path != null) {
       Runtime.getRuntime().addShutdownHook(new Thread( // NOPMD - this is not a webapp
-          new Runnable() {
-            @Override
-            public void run() {
-              try {
-                Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
-                  @Override
-                  public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-                    Files.delete(file);
+          () -> {
+            try {
+              Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
+                @Override
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                  Files.delete(file);
+                  return FileVisitResult.CONTINUE;
+                }
+
+                @Override
+                public FileVisitResult postVisitDirectory(Path dir, IOException ex) throws IOException {
+                  if (ex == null) {
+                    Files.delete(dir);
                     return FileVisitResult.CONTINUE;
                   }
-
-                  @Override
-                  public FileVisitResult postVisitDirectory(Path dir, IOException ex) throws IOException {
-                    if (ex == null) {
-                      Files.delete(dir);
-                      return FileVisitResult.CONTINUE;
-                    }
-                    // directory iteration failed for some reason
-                    throw ex;
-                  }
-                });
-              } catch (IOException ex) {
-                throw new JUnitException("Failed to delete collection: " + path, ex);
-              }
+                  // directory iteration failed for some reason
+                  throw ex;
+                }
+              });
+            } catch (IOException ex) {
+              throw new JUnitException("Failed to delete collection: " + path, ex);
             }
           }));
     }
@@ -356,7 +353,6 @@ private DynamicContainer generateScenario(
         Stream.concat(Stream.of(validateSchema), contentTests).sequential());
   }
 
-  @SuppressWarnings("unchecked")
   protected Path convertContent(
       @NonNull URI contentUri,
       @NonNull Path generationPath,
@@ -381,8 +377,8 @@ protected Path convertContent(
     }
 
     @SuppressWarnings("rawtypes") ISerializer serializer
-        = context.newSerializer(getRequiredContentFormat(), object.getClass());
-    serializer.serialize(object, convertedContetPath, getWriteOpenOptions());
+        = context.newSerializer(getRequiredContentFormat(), ObjectUtils.asType(object.getClass()));
+    serializer.serialize(ObjectUtils.asType(object), convertedContetPath, getWriteOpenOptions());
 
     return convertedContetPath;
   }
@@ -498,6 +494,9 @@ private static void logFinding(@NonNull IValidationFinding finding) {
     case INFORMATIONAL:
       logBuilder = LOGGER.atInfo();
       break;
+    case DEBUG:
+      logBuilder = LOGGER.atDebug();
+      break;
     default:
       throw new IllegalArgumentException("Unknown level: " + finding.getSeverity().name());
     }
diff --git a/pom.xml b/pom.xml
index ef9c7d849..3bfee768a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,7 @@
 		<dependency.moxy.version>4.0.2</dependency.moxy.version>
 		<dependency.plexus-utils.version>4.0.0</dependency.plexus-utils.version>
 		<dependency.plexus-build-api.version>1.2.0</dependency.plexus-build-api.version>
+		<dependency.pmd.version>7.1.0</dependency.pmd.version>
 		<dependency.saxon.version>12.4</dependency.saxon.version>
 		<dependency.spotbugs-annotations.version>4.8.3</dependency.spotbugs-annotations.version>
 		<dependency.stax2-api.version>4.2.2</dependency.stax2-api.version>
@@ -156,8 +157,9 @@
 		<plugin.maven-changes.version>2.12.1</plugin.maven-changes.version>
 		<plugin.maven-invoker.version>3.6.0</plugin.maven-invoker.version>
 		<plugin.maven-toolchains.version>3.1.0</plugin.maven-toolchains.version>
+		<plugin.pmd.version>3.22.0</plugin.pmd.version>
+		<plugin.spotbugs.version>4.8.4.0</plugin.spotbugs.version>
 		<plugin.templating.version>3.0.0</plugin.templating.version>
-
 		<!-- The Surefire and Failsafe configurations override the <argLine>
 		element using the @{argLine} notation which
          allows to include any argLine defined by plugins executing before them (such as
@@ -209,6 +211,11 @@
 				<artifactId>metaschema-databind</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>metaschema-databind-modules</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>${project.groupId}</groupId>
 				<artifactId>metaschema-freemarker-support</artifactId>
@@ -526,6 +533,11 @@
 				<artifactId>biz.aQute.bnd.util</artifactId>
 				<version>6.4.1</version>
 			</dependency>
+			<dependency>
+			    <groupId>org.eclipse.jdt</groupId>
+			    <artifactId>org.eclipse.jdt.annotation</artifactId>
+			    <version>2.3.0</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
@@ -648,6 +660,7 @@
 				<plugin>
 					<groupId>com.github.spotbugs</groupId>
 					<artifactId>spotbugs-maven-plugin</artifactId>
+					<version>${plugin.spotbugs.version}</version>
 					<configuration>
 						<excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
 						<sarifOutput>true</sarifOutput>
@@ -696,6 +709,19 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-pmd-plugin</artifactId>
+					<version>${plugin.pmd.version}</version>
+					<dependencies>
+						<dependency>
+							<groupId>net.sourceforge.pmd</groupId>
+							<artifactId>pmd-core</artifactId>
+							<version>${dependency.pmd.version}</version>
+						</dependency>
+						<dependency>
+							<groupId>net.sourceforge.pmd</groupId>
+							<artifactId>pmd-java</artifactId>
+							<version>${dependency.pmd.version}</version>
+						</dependency>
+					</dependencies>
 					<executions>
 						<execution>
 							<id>pmd-verify</id>
diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractGenerationState.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractGenerationState.java
index 9154df480..8e108b8f5 100644
--- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractGenerationState.java
+++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractGenerationState.java
@@ -114,7 +114,7 @@ protected static AllowedValueCollection getContextIndependentEnumeratedValues(
         closed = true;
       }
 
-      if (!MetapathExpression.CONTEXT_NODE.equals(constraint.getTarget())) {
+      if (!MetapathExpression.CONTEXT_NODE.getPath().equals(constraint.getTarget())) {
         values = CollectionUtil.emptyList();
         break;
       }
diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ModuleIndex.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ModuleIndex.java
index 3a6cb48cc..5a28346fe 100644
--- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ModuleIndex.java
+++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/ModuleIndex.java
@@ -269,7 +269,7 @@ public boolean isChoiceSibling() {
     public boolean isUsedAsJsonKey() {
       return references.stream()
           .anyMatch(ref -> ref instanceof INamedModelInstance
-              && ((INamedModelInstance) ref).getJsonKeyFlagName() != null);
+              && ((INamedModelInstance) ref).hasJsonKey());
     }
 
     public boolean isUsedWithoutJsonKey() {
@@ -277,12 +277,12 @@ public boolean isUsedWithoutJsonKey() {
           || references.isEmpty()
           || references.stream()
               .anyMatch(ref -> ref instanceof INamedModelInstance
-                  && ((INamedModelInstance) ref).getJsonKeyFlagName() == null);
+                  && !((INamedModelInstance) ref).hasJsonKey());
     }
 
     public boolean isChoiceGroupMember() {
       return references.stream()
-          .anyMatch(ref -> ref instanceof INamedModelInstanceGrouped);
+          .anyMatch(INamedModelInstanceGrouped.class::isInstance);
     }
   }
 }
diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/AbstractDatatypeManager.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/AbstractDatatypeManager.java
index 280762418..98b58fb5d 100644
--- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/AbstractDatatypeManager.java
+++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/AbstractDatatypeManager.java
@@ -89,7 +89,7 @@ public String getTypeNameForDatatype(@NonNull IDataTypeAdapter<?> datatype) {
     synchronized (this) {
       String name = datatypeToTypeMap.get(datatype);
       if (name == null) {
-        name = getDatatypeTranslationMap().get(datatype.getPreferredName());
+        name = getDatatypeTranslationMap().get(datatype.getPreferredName().getLocalPart());
         datatypeToTypeMap.put(datatype, name);
       }
       return name;
diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonProperty.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonProperty.java
index 7af1cb4a3..122cf8b70 100644
--- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonProperty.java
+++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractJsonProperty.java
@@ -44,6 +44,7 @@ protected AbstractJsonProperty(@NonNull I instance) {
   }
 
   @Override
+  @NonNull
   public I getInstance() {
     return instance;
   }
diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractModelDefinitionJsonSchema.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractModelDefinitionJsonSchema.java
index 09ae2a978..1e7223be2 100644
--- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractModelDefinitionJsonSchema.java
+++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AbstractModelDefinitionJsonSchema.java
@@ -42,6 +42,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public abstract class AbstractModelDefinitionJsonSchema<D extends IModelDefinition>
     extends AbstractDefinitionJsonSchema<D> {
@@ -56,6 +57,7 @@ public abstract class AbstractModelDefinitionJsonSchema<D extends IModelDefiniti
   @NonNull
   private final IKey key;
 
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   protected AbstractModelDefinitionJsonSchema(
       @NonNull D definition,
       @Nullable String jsonKeyFlagName,
@@ -71,7 +73,8 @@ protected AbstractModelDefinitionJsonSchema(
 
     // determine the flag instances to generate
     if (jsonKeyFlagName != null) {
-      IFlagInstance jsonKeyFlag = definition.getFlagInstanceByName(jsonKeyFlagName);
+      IFlagInstance jsonKeyFlag = definition.getFlagInstanceByName(
+          definition.getContainingModule().toFlagQName(jsonKeyFlagName));
       if (jsonKeyFlag == null) {
         throw new IllegalArgumentException(
             String.format("The referenced json-key flag-name '%s' does not exist on definition '%s'.",
diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AssemblyDefinitionJsonSchema.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AssemblyDefinitionJsonSchema.java
index f33419a29..5db38df96 100644
--- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AssemblyDefinitionJsonSchema.java
+++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AssemblyDefinitionJsonSchema.java
@@ -126,8 +126,6 @@ public void gatherDefinitions(
   protected void generateBody(
       IJsonGenerationState state,
       ObjectNode obj) throws IOException {
-    IAssemblyDefinition definition = getDefinition();
-
     obj.put("type", "object");
 
     PropertyCollection properties = new PropertyCollection();
@@ -152,7 +150,7 @@ protected void generateBody(
       property.generateProperty(properties, state);
     }
 
-    Collection<? extends IChoiceInstance> choices = definition.getChoiceInstances();
+    Collection<? extends IChoiceInstance> choices = getDefinition().getChoiceInstances();
     if (choices.isEmpty()) {
       properties.generate(obj);
       obj.put("additionalProperties", false);
@@ -171,7 +169,7 @@ protected void generateBody(
   protected void generateChoices(
       List<PropertyCollection> propertyChoices,
       @NonNull ObjectNode definitionNode,
-      @NonNull IJsonGenerationState state) throws IOException {
+      @NonNull IJsonGenerationState state) {
     ArrayNode anyOfdNode = ObjectUtils.notNull(JsonNodeFactory.instance.arrayNode());
     for (PropertyCollection propertyChoice : propertyChoices) {
       ObjectNode choiceDefinitionNode = ObjectUtils.notNull(JsonNodeFactory.instance.objectNode());
diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/ChoiceGroupInstanceJsonProperty.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/ChoiceGroupInstanceJsonProperty.java
index 3977a26f5..7ea8075c3 100644
--- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/ChoiceGroupInstanceJsonProperty.java
+++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/ChoiceGroupInstanceJsonProperty.java
@@ -39,6 +39,7 @@
 import java.util.Map;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class ChoiceGroupInstanceJsonProperty
     extends AbstractJsonProperty<IChoiceGroupInstance>
@@ -46,6 +47,7 @@ public class ChoiceGroupInstanceJsonProperty
 
   private final IModelInstanceBuilder<?> collectionBuilder;
 
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public ChoiceGroupInstanceJsonProperty(
       @NonNull IChoiceGroupInstance instance,
       @NonNull IJsonGenerationState state) {
diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/FieldDefinitionJsonSchema.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/FieldDefinitionJsonSchema.java
index 4ecbc7759..b660f3bd0 100644
--- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/FieldDefinitionJsonSchema.java
+++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/FieldDefinitionJsonSchema.java
@@ -69,9 +69,9 @@ protected void generateBody(
 
     Collection<? extends IFlagInstance> flags = definition.getFlagInstances();
     String discriminatorProperty = getDiscriminatorProperty();
-    IFlagInstance jsonKeyFlag = definition.getJsonKeyFlagInstance();
+    IFlagInstance jsonKeyFlag = definition.getJsonKey();
     if (discriminatorProperty == null
-        && (flags.isEmpty() || (jsonKeyFlag != null && flags.size() == 1))) { // NOPMD readability
+        && (flags.isEmpty() || jsonKeyFlag != null && flags.size() == 1)) { // NOPMD readability
       // field is a simple data type value if there are no flags or if the only flag
       // is a JSON key
       IDataTypeJsonSchema schema = state.getDataTypeSchemaForDefinition(definition);
diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/MetadataUtils.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/MetadataUtils.java
index 4d88eccc6..35a7e6266 100644
--- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/MetadataUtils.java
+++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/MetadataUtils.java
@@ -40,7 +40,7 @@
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.model.IModelElement;
-import gov.nist.secauto.metaschema.core.model.INamed;
+import gov.nist.secauto.metaschema.core.model.INamedModelElement;
 import gov.nist.secauto.metaschema.core.model.IValuedDefinition;
 import gov.nist.secauto.metaschema.core.model.IValuedInstance;
 
@@ -54,14 +54,14 @@ private MetadataUtils() {
     // disable construction
   }
 
-  public static void generateTitle(@NonNull INamed named, @NonNull ObjectNode obj) {
+  public static void generateTitle(@NonNull INamedModelElement named, @NonNull ObjectNode obj) {
     String formalName = named.getEffectiveFormalName();
     if (formalName != null) {
       obj.put("title", formalName);
     }
   }
 
-  public static <NAMED extends INamed & IModelElement> void generateDescription(@NonNull NAMED named,
+  public static <NAMED extends INamedModelElement & IModelElement> void generateDescription(@NonNull NAMED named,
       @NonNull ObjectNode obj) {
     MarkupLine description = named.getEffectiveDescription();
 
diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/builder/AbstractCollectionBuilder.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/builder/AbstractCollectionBuilder.java
index 1e9c5f5d4..118e4bf24 100644
--- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/builder/AbstractCollectionBuilder.java
+++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/builder/AbstractCollectionBuilder.java
@@ -47,6 +47,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public abstract class AbstractCollectionBuilder<T extends AbstractCollectionBuilder<T>>
     extends AbstractBuilder<T>
@@ -139,19 +140,11 @@ private abstract static class Type<T extends INamedModelInstance> implements IMo
     @NonNull
     private final IKey key;
 
+    @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
     protected Type(@NonNull T instance) {
       this.namedModelInstance = instance;
 
-      String jsonKeyFlagName = instance.getJsonKeyFlagName();
-      IFlagInstance jsonKey = null;
-      if (jsonKeyFlagName != null) {
-        jsonKey = instance.getDefinition().getFlagInstanceByName(jsonKeyFlagName);
-
-        if (jsonKey == null) {
-          throw new IllegalStateException(String.format("No JSON key flag named '%s.", jsonKeyFlagName));
-        }
-      }
-      this.jsonKeyFlag = jsonKey;
+      this.jsonKeyFlag = instance.getEffectiveJsonKey();
 
       if (instance instanceof INamedModelInstanceGrouped) {
         INamedModelInstanceGrouped grouped = (INamedModelInstanceGrouped) instance;
@@ -162,7 +155,11 @@ protected Type(@NonNull T instance) {
         this.discriminatorValue = null;
       }
       this.key
-          = IKey.of(instance.getDefinition(), jsonKeyFlagName, this.discriminatorProperty, this.discriminatorValue);
+          = IKey.of(
+              instance.getDefinition(),
+              jsonKeyFlag == null ? null : jsonKeyFlag.getName(),
+              this.discriminatorProperty,
+              this.discriminatorValue);
     }
 
     @NonNull
diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/JDom2XmlSchemaLoader.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/JDom2XmlSchemaLoader.java
index b2a9c3c86..738cb135f 100644
--- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/JDom2XmlSchemaLoader.java
+++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/JDom2XmlSchemaLoader.java
@@ -54,11 +54,13 @@ public class JDom2XmlSchemaLoader {
   private final Document document;
 
   @SuppressWarnings("null")
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public JDom2XmlSchemaLoader(@NonNull Path path) throws JDOMException, IOException {
     this(new SAXBuilder().build(path.toFile()));
   }
 
   @SuppressWarnings("null")
+  @SuppressFBWarnings(value = "CT_CONSTRUCTOR_THROW", justification = "Use of final fields")
   public JDom2XmlSchemaLoader(@NonNull InputStream is) throws JDOMException, IOException {
     this(new SAXBuilder().build(is));
   }
diff --git a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/JsonSuiteTest.java b/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/JsonSuiteTest.java
index 2d27f243a..cfd08e8e4 100644
--- a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/JsonSuiteTest.java
+++ b/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/JsonSuiteTest.java
@@ -34,7 +34,6 @@
 import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator;
 import gov.nist.secauto.metaschema.databind.io.Format;
 import gov.nist.secauto.metaschema.databind.model.metaschema.BindingModuleLoader;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
 import gov.nist.secauto.metaschema.schemagen.json.JsonSchemaGenerator;
 
 import org.junit.jupiter.api.Disabled;
@@ -135,7 +134,7 @@ void testOscalComplete() throws IOException, MetaschemaException { // NOPMD - de
     BindingModuleLoader loader = new BindingModuleLoader();
     loader.allowEntityResolution();
 
-    IBindingModule module = loader.load(new URL(
+    IModule module = loader.load(new URL(
         "https://raw.githubusercontent.com/usnistgov/OSCAL/develop/src/metaschema/oscal_complete_metaschema.xml"));
     ISchemaGenerator schemaGenerator = new JsonSchemaGenerator();
     IMutableConfiguration<SchemaGenerationFeature<?>> features
@@ -156,7 +155,7 @@ void testTestMetaschema() throws IOException, MetaschemaException { // NOPMD - d
     BindingModuleLoader loader = new BindingModuleLoader();
     loader.allowEntityResolution();
 
-    IBindingModule module = loader.load(new URL(
+    IModule module = loader.load(new URL(
         "https://raw.githubusercontent.com/usnistgov/metaschema/71233f4eb6854e820c7949144e86afa4d7981b22/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"));
     ISchemaGenerator schemaGenerator = new JsonSchemaGenerator();
     IMutableConfiguration<SchemaGenerationFeature<?>> features = new DefaultConfiguration<>();
diff --git a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/MetaschemaModuleTest.java b/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/MetaschemaModuleTest.java
index 5f57d26c1..4fae0da85 100644
--- a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/MetaschemaModuleTest.java
+++ b/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/MetaschemaModuleTest.java
@@ -28,10 +28,10 @@
 
 import gov.nist.secauto.metaschema.core.configuration.DefaultConfiguration;
 import gov.nist.secauto.metaschema.core.configuration.IMutableConfiguration;
+import gov.nist.secauto.metaschema.core.model.IModule;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.model.metaschema.BindingModuleLoader;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
 import gov.nist.secauto.metaschema.schemagen.json.JsonSchemaGenerator;
 import gov.nist.secauto.metaschema.schemagen.xml.XmlSchemaGenerator;
 
@@ -41,7 +41,6 @@
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.OpenOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
@@ -57,7 +56,7 @@ class MetaschemaModuleTest {
   void testGenerateMetaschemaModuleJson() throws MetaschemaException, IOException {
     BindingModuleLoader loader = new BindingModuleLoader();
 
-    IBindingModule module = loader.load(METASCHEMA_FILE);
+    IModule module = loader.load(METASCHEMA_FILE);
 
     IMutableConfiguration<SchemaGenerationFeature<?>> features
         = new DefaultConfiguration<>();
@@ -67,11 +66,7 @@ void testGenerateMetaschemaModuleJson() throws MetaschemaException, IOException
     try (Writer writer = Files.newBufferedWriter(
         Path.of("target/metaschema-schema.json"),
         StandardCharsets.UTF_8,
-        new OpenOption[] {
-            StandardOpenOption.CREATE,
-            StandardOpenOption.WRITE,
-            StandardOpenOption.TRUNCATE_EXISTING
-        })) {
+        StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING)) {
       assert writer != null;
       ISchemaGenerator schemaGenerator = new JsonSchemaGenerator();
       schemaGenerator.generateFromModule(module, writer, features);
@@ -82,7 +77,7 @@ void testGenerateMetaschemaModuleJson() throws MetaschemaException, IOException
   void testGenerateMetaschemaModuleXml() throws MetaschemaException, IOException {
     BindingModuleLoader loader = new BindingModuleLoader();
 
-    IBindingModule module = loader.load(METASCHEMA_FILE);
+    IModule module = loader.load(METASCHEMA_FILE);
 
     IMutableConfiguration<SchemaGenerationFeature<?>> features
         = new DefaultConfiguration<>();
@@ -92,11 +87,7 @@ void testGenerateMetaschemaModuleXml() throws MetaschemaException, IOException {
     try (Writer writer = Files.newBufferedWriter(
         Path.of("target/metaschema-schema.xsd"),
         StandardCharsets.UTF_8,
-        new OpenOption[] {
-            StandardOpenOption.CREATE,
-            StandardOpenOption.WRITE,
-            StandardOpenOption.TRUNCATE_EXISTING
-        })) {
+        StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING)) {
       assert writer != null;
       ISchemaGenerator schemaGenerator = new XmlSchemaGenerator();
       schemaGenerator.generateFromModule(module, writer, features);
diff --git a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/XmlSuiteTest.java b/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/XmlSuiteTest.java
index ac7b439ec..580793793 100644
--- a/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/XmlSuiteTest.java
+++ b/schemagen/src/test/java/gov/nist/secauto/metaschema/schemagen/XmlSuiteTest.java
@@ -36,7 +36,6 @@
 import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator;
 import gov.nist.secauto.metaschema.databind.io.Format;
 import gov.nist.secauto.metaschema.databind.model.metaschema.BindingModuleLoader;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingModule;
 import gov.nist.secauto.metaschema.schemagen.xml.XmlSchemaGenerator;
 
 import org.jdom2.Document;
@@ -176,7 +175,7 @@ void testliboscalJavaIssue181() throws IOException, MetaschemaException, XMLStre
     BindingModuleLoader loader = new BindingModuleLoader();
     loader.allowEntityResolution();
 
-    IBindingModule module = loader.load(new URL(
+    IModule module = loader.load(new URL(
         // "https://raw.githubusercontent.com/usnistgov/OSCAL/develop/src/metaschema/oscal_complete_metaschema.xml"));
         "https://raw.githubusercontent.com/usnistgov/OSCAL/v1.1.1/src/metaschema/oscal_catalog_metaschema.xml"));
     ISchemaGenerator schemaGenerator = new XmlSchemaGenerator();
@@ -213,7 +212,7 @@ void testLiboscalJavaIssue181() throws IOException, MetaschemaException, XMLStre
     BindingModuleLoader loader = new BindingModuleLoader();
     loader.allowEntityResolution();
 
-    IBindingModule module = loader.load(new URL(
+    IModule module = loader.load(new URL(
         "https://raw.githubusercontent.com/usnistgov/OSCAL/v1.1.1/src/metaschema/oscal_catalog_metaschema.xml"));
     ISchemaGenerator schemaGenerator = new XmlSchemaGenerator();
     IMutableConfiguration<SchemaGenerationFeature<?>> features = new DefaultConfiguration<>();
diff --git a/src/site/site.xml b/src/site/site.xml
index 643b3c61b..f5dc38049 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -12,7 +12,7 @@
 	</bannerLeft>
 
 	<publishDate position="bottom" format="yyyy-MM-dd" />
-	<version position="navigation-bottom" />
+	<version position="left" />
 
 	<skin>
 		<groupId>io.github.devacfr.maven.skins</groupId>
@@ -115,5 +115,6 @@
 		</menu>
 		<menu name="Modules" ref="modules" />
 		<menu name="Maven Documentation" ref="reports" inherit="bottom" />
+		<footer><![CDATA[]]></footer>
 	</body>
 </project>
\ No newline at end of file