Mass refactoring. Storage with Scopes, Grants etc. Plumbs on Authorization (infinite cycle).