Add event component back into the core