Improved the configuration system