Allow storage module to be set explicitly

Rather than just by name