Added ability to specify per-agent options.