added support for storage