Fixed re-design of session management