Improved routes and put in session access