Attempted to fix issues with model inheritance.