Add map realted macros