Add 1.6.0 support as well as "no login needed" support