Improve event system
Add origin updated event