Changed DC enumeration to more universal method