Back to working on contract-date-util module