Added more features, for example composition of streams