CARE #20: Updated database creation sql