Add map-object macros and improve map-layer macros