Removed ClientInvocation since unused