Linting fixes
Add support for multiple data storage directories