Fix refactoring on UserSession