WINDUP-152 map in props

See the jira. Will reformat if okay to merge.
I'm not exactly sure how this is different from the above annotation?