Added computer ID distinguishing