Added CanvasAnimation and related bits