Adding hostname support.