some refactoring on streaming entities