I believe these should use AgentCommandEvents, see https://docs.google.com/drawings/d/1LXa33E_aBFeZxloegRQ7uMZ78lxhAmOGmL-wyMv83LM/edit and check with EH.