Fixed up model subclasses.