Marketplace and Modernization changes