Added partial specs and factory