[DNB] Partial Refactor