Made changes in Model part of the project