Changed ContractReport Class around