Updated property editors legacy -> new mappings