New builder working draft
Refactor
Refactor
New builder for domain update test