Add ability to override hostname