Adding Hostname capability