Added task persistence
Merge branch 'DataStorage'