added rect/circ/circle support fo canvas