Rewrite to support Host entries