Change Session to UserSession (API Change)