2.0 support updates