Refactoring in CanvasManager - using cursor in command handler