Update to use server Id