Did the same design with Config, and updated a bit of code.