[#94] session controller refactored