Finishing touches on the database