Starting to add support for session management