Updated to use values in config