Add custom Event classes