Complete rewrite of the configuration system