DMaaP DR refactoring