Added StorageInterface