Improved the configuration structure.