Changed config from custom object to simple map