CreateOrUpdateBuilder #18

Builder implementation
(1 test failure - propagated ID)