Changes needed to integrate sos-session-api