Replaced hard-coded cpconfig references with the variable