Add clasification to organizations and make it optional