Refactoring VHost integration