Get rid of Build() calls