Yes that is a very good suggestion. The other thing that occurred to me is that the Stream itself should be the one that provides the container matcher since it is the deployment manifest that will provide hints as to which containers should host modules. Right now we have a single instance owned by the Admin server that is shared.