Added rounded corner support