Added StorageAdapter and TaskCompletionHandler