Add missing events. Fix #2