Remove unnecessary Database struct and add more persistence.