Changed routes for better consistency