Fix: Events Dictionary