Added more macros for point and rect.