Upgraded config