Make the batter driver follow the updated storage interface