Working on stream rest management