Added experimental macro system