WINDUP-152 map in props

See the jira. Will reformat if okay to merge.
The "Practical API Design" book states that it's always better to start with more limited API and make broader on request, than the other way around when a limitation of underlying impl is found. But as you wish.