Refactor session to User model