Add support for hosts