Simplified the configuration of the storage engine (BC break inside)