Added suport to detect and resolve hostnames