Add Host Info and Entity Support