add some backwards compatability and future proofing for map entities