Added more routes and user info