Update to 2.0, move to using defaults