Upgraded configuration