More work on the canvas plugin