NDC refactoring