Updated system and event class.