Updated support for 1.5.0