Updated to be consistent with v2.0.0