Added 7.1.1 support