Updates to Database Implementation