Updated database creation queries