Add stream version handling