Event Receiver Optimisation