Add support for hostname field