Update the SpecBuilder to respect embedded setting