changed the routing a bit, also schemas