Adding structure for Select + Stream