FBSessionScope refactored