Added more prefix and suffix macros