Added more macros to base