Major simplification on the configuration strategy