Extend events refactor