Continue improve macro system