Updated database generation scripts