Update config for new structure