Switch to using storage driver for standalone r/w files