Right - I think we should support referencing a specific MDS rather than using the global one; but that's a new JIRA, I agree.