Changes for ContractConfigurator.