Update with 2.0 resources