CDITCK-415 adding events synchronously to prevent concurrency issue