SchemaBuilders refactor