Finish basic animation support