Refactor plugin -> Make it work without organization_memberships