Initial storage module and storage/synchronizers API support.
Fixup merge