Initial *untested* support for database storage