Improve support for agent_bandwidth