MapEntity map init refactor