Consolidated classes to match DD