TDB-88 Refactoring sur ContractService