Began decomposition to improve robustness and simplify maintenance.