Refactoring: Moving commands out of canvasManager