Improvements and added listing to the Host.