Add new classes. CanvasConverter is tested