More stuff for the config system