Refactored Contractor feature to three tier architecture.