Updated support for 1.8.0