Improvements to config module