added support for using the typed updated builder with the new api.