Added scopes and validations to organizations