- Reverted last commit
- Try to create data directory if it doesn't exist