Updated Manager and AnimationManager