Future of 2.6 support