Update to using embedded database for everything