Updated OrganizationDAO and Organization