Fix: Added DNS support