Merge "refactor config parser to facilitate adding new configs"