Moved events to boot