Change of config administration and configration method to make it more readable.