updated builder to support events"