Adding a option to override hostname