Changed the routes to improve the performance.