Fixed database setup