Allow targeting of specific agent

Change-Id: I77aa4bbd2b46aca07255f228921db4fddfaeee35