Improving the config handling