Made streams more generic.