I'm not sure if this will work at the moment. We only use event.comment_id when absolutely necessary, otherwise we usually use eventable. So we'll have to sit down together and write a migration for all the comment events to store comment_id and think hard to make sure it will actually work and won't mess anything up.