JARVIS-338 support for new config structure.