Added macro system