Work with config files improvements