Add substance data
Remove output data and add config