Another batch of model changes
Merge pull request #140 from findsorguk/updateModels

Another batch of model changes