CYKLO-987: expanded organization data model