Add event handing to Client.cs