Improve the diagonosis model