Moved event factory construction to enable

Signed-off-by: bergerkiller <bergerkiller@gmail.com>