Add macros pointing to new agent's repo. Fix necessary macro calls#458