Upgraded Config to use attributes