[WIP] changed session manager interface