adding more configuration logic