Improve the API for the event builder, use "with" as a key word