DNS: Refactor wallet