Rename the class to match those for other models stored in this way. And add some missing methods to make it usable as a normal model. Also tidy up the class a bit.