Use published version of MapEntity