UPDATED code due to renaming and refactoring of some DRUM classes