CLOUD-39 map changed to set with domainobjects