Updated to support 1.3.0