Add events v2. Resolves #108