Added support for db loading from disk