Working Canvas support, finally!