Work in progress
Fix database setup for multi-server scenarios