Add a had_v2 marker to keep track
Add 22tracks support