Updated to use v2 config for certain values

Will need to update all of them in the future