Modification related to Host Entry