Initial 1.7 support