DVV Refactoring