Add support for agents