Refactor config parameters - work in progress.