Working on new agent apis