Improved functionality and abilty to use hosts instead of IP