adjust to new config structure