Put session refactoring on hold