Update with new convention