Added macro for z3