Add more events, generate proper errors for said events