Further improve the config system