Improve routes to match database schema.