#25 adaptations related to cismet/cismap-commons/#64