Updated StorageEngine and Task class