Performance improvements to service builder