[5] Added dedicated module for storage, separated interfaces for queue and storage.