Add the ability to override hostname