F31: Update components and system to use EventHandler.

Done