Add support for rectangles