Add hostname support