Some more macros added.