Added support for non-filled rectangles