Updated support for 1.7.0