Feat/issue5

Added the committed changes for the new session handler.