WINDUP-152 map in props

See the jira. Will reformat if okay to merge.
WINDUP-168 has been fixed.