Revamped the event pairs dict