Changes for master agreement expander