Better handling of vhosts