Updated: to schema and api client