Added machine and user tags