Add macro load and other changes