adding hostname support