Updating agent to use Tags