Update VHOST functionality to support solve for issue #2