Added 'until' block to streams