Agreed. It could be a field in the config structure I suppose. Would go naturally together with the agent/server specific data.

In any case, let's work with what we have and not hold back this any longer. Merging.