Upcoming support for 1.7