Updated database creation scripts to DatabaseVersion 2