updated to support new storage module