Stream Class updated