Improving Factory and Transformer composability