WINDUP-152 map in props

See the jira. Core reformat if okay to merge.
Hehe I confess