Added more event triggers. Resolves #2