Session info refactoring