Some macros added..