Refactored how we use sessions