Enhance MapAnimator