Added hosts select feature