Configuration mappings issues fixed.