Updated Database_Functions