Add support for storage