Re-write of the configuration system