CanvasTools was extracted in a separate class