Enhance DrillingDepartment Domain State class