Modified for multi-server setup