Updated to use session-manager