Add support for configurable hostname