Update to work with server-compatible LL