Adom configuration changes for newer adom version (pre-relase 18)