Complete spec 2.x/3.x cross-compatibility