Update macro for xe6