Schemas, routing fixes