Made sure we use objects in builders and removed the Combiner.