Update to support server role