Refactored user sesssions