Merge EntMan into MapMan