Added hosts and services tools