Added hostname support