Feature/schema builder