Add a few more macros