Adding corrected stream-definitions