Some MapAnimator rework