Property level mapping; made string mapping more flexible