improved

API Schema Optimisations