Proper ordering on EventListeners and EventTargets. Added utility header WithUuid.h