add generic hosts feature