Improved support of different vhost definition