Make StateDataStream a factory and use a short name