Add client event support