Add rectangle support for CGM.