Added formatting macros