This is a follow on epic from PUP-8711 where agent functions were first introduced. This epic is about follow on tickets with improvements.