Added additional macros.