Added stuff for the Database