added support for other storages