Add (untested) database stuff