Added more helper macros