Changes in Database and DatabaseInterface.
Only one change TODO :(