Added implementation for storage