Make user attrs and events overridable
Update Include import