CTF: Added context to event type