Version bump to 2.0 and tuple representation changes