Added Verifier model, working with events
Cleanup