Rework parameter factories, contingencies, and decouple configuration