Changed BaseController.GetOrganizationContext to property