Update to the last 2.0 changes