Update to support 2.0.2