Update with new config format