More model updates
Merge pull request #128 from findsorguk/updateModels

More model updates