Replace _ with - in dns names
Added dns support