Updated to reflect 2.0 changes