Initial SchemaManager commit