Adapt to SessionManager