Now uses server id