Rework on configuration files