Added updates to Database and DatabaseResult (which we actually don't need anymore)