A few more changes
Merge pull request #139 from findsorguk/updateModels

A few more changes