Reworked Storage design allowing to use both statically and dynamically connected storages transparently for the clients.