Fixed config and data path
Merge