BACKLOG-5041 Implement property mappings (not working yet)