better configuration files handling
better configuration files handling