Add custom event support