Got rid of dependency on the non-class enum D Dstar modes