Updated to reflect v2 changes