Upgraded to new setting structure