Added proper DNS support