Added support for file and in-memory databases