Adds host support
Fix