Added session handling to RCM