Improve immutability for Event Data at AddOns