Update implementation of Stream