Re-introduced using multiple config files and input files.
Code cleanup