add support for builtin storage modules

This should fix Issue #331