Refactor context instantiation in OrganizationStorage
Prevent over-completing contexts