Add TODO to expand object added builder to more types.