Fix Vault integration
Fix updater
Refactor events to use CommonSense