Removing organization_id requirement