Update for latest 2.0.0 release