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

Another batch of changes