More support for embedded db.