Moved events to a namespace