[duim-reference] Some improvements.