Added some more events for our client implementation