Improve animation support