Refactor for all the animation framework overhaul