Changed to reflect v2.0 changes