Updated to support 1.6.0