Add new macros to support hide-show