Update to use server id