Add more structure to host and service details