Added more attributes to organizations