Rebuild without object cloning