Subschema improvements