Adds custom event support