Fix: Storage now extends Model