Added some changes to files of MODEL