change Legacy to Stream and ALL SingleObjectSelector will become stream module (need to verify that compiles...)