Add support for more storage packets