Added 1.7 support