Re-implement hooks of storage