Added ability to show hostname