* Updating to new config class