Removed EventBuilder, added Events factory class