Macros for integral criteria added