Improvement for config handling