More safety in handling the config. Old core compatible.