Refactor animate
plugin support