Go Agents to have multiple environments and resources defined

I would like to see agents supporting multiple Environment - Resource combinations, so that i can use an agent for more than one type of job.

One example is a little used UAT appserver agent that currently deploys .net code to the application Server in the UAT environment. It is associated with environment = UAT and resource =appserver. Now i would like to use it for refreshing a database in its spare time. For this it needs to be associated with Test_module, dev_module, UAT and other environmets for the refresh, and resource= refresh.

If I just add both refresh and appaserver as resources, and all the environments above to the one agent, it will start to process appserver jobs for the test module, which is clearly undesirable.

What I would like to be able to do is defined a set of resources that the agent has for each environment, so that multiple sets of resource /environment combinations can exist for an agent.

This would mean more configuration as the agent can no longer pull the resource and environments together, they would have to be explicitly set, but would allow more flexibility in operating the agents. I could add more dedicated agents, but I don't currently have any more reliable machines with the necessary firewall access to add agents to.