Fixed database creation