Improve model HK for Maintenance