Task Storage - Refactoring