Improved schemas and routing