Add custom host support