More ConfigReader decoupling.
More ConfigReader decoupling.