WINDUP-152 map in props

See the jira. Will reformat if okay to merge.
Sure. This was copied from my older code. Removed, anyway.