Fixed subschema creation