Added a database wrapper (not currently enabled)