Add SchemaBuilder and tests