dpb refactoring