OGDCH-164: Design for organizations