Contractor refactoring
Merge
Contractor refactoring