Agent improvements

Change-Id: I320413e8b9ca581defa51188710b6b0faac7ffef