As a part of this also investigate if we can make the user-specified configuration more consistent with where it is used