Simplify overloaded Stream - move to Elements