Initial add of multiclass OVA support.