Added more variables to the database structs