Update after agent API change