Updated the Model and service
Merge branch 'master' of https://github.com/ELEN7045-Group1/group-project