Refactored client routes.