Changes:
- removed baseDir to dataPath