added support for custom host