Update Interface and Test files for Database accordingly