Reorganized event handling
Relaxed opt restrictions on archive