Make models more consistent with existing models