New version to handle updated config handling