WINDUP-152 map in props

See the jira. Will reformat if okay to merge.
Try not to use wildcard imports. Use expanded imports. Thanks!