Add support for custom host/port