CFY-660 use properties instead of dict keys