Improvements to Model subclasses.