Removing dependancy on session var for routing