Merge "Config: Add Config and GlobalConfig classes"