Improves AnimationHandler