Update to support new animation interface