CFY-1598 added types to the mandatory properties.