Merged in new database reset feature