Add support for drawing squares and rectangles