Added utility macros