Demuxer improvement