Improve EventChecker