Change to Map based properties.