Fix Builder and add specs.