Improvement to config parser