Add hostname and ip as possible arguments