Add component_id to events