Expanded database setup