Merge: Contract refactoring