refactor
Task persistence