Partial implementation to the canvas refactoring