Updated to use the new model fields

With this I'm comfortable that we can close issues #15, #13, #6 and #12.