Effective handling of changes to the contract