Enhancement: Re-usable storage id regex

- Use the existing regex to build the storage id regex, based on what we did in Deuce Client