1.6 and 1.7 support