Re-factored property and unit domain model and the corresponding code in controllers and views.