Updated to reflect v2.2.0 updates