Change for session refactor