Moving to new configuration loading concept