Add event and System class