Updated documentation and get rid of Hostname