Refactor configuration of DNData