Add support for session management