Added support for rounded rectangles