Separate ExpanderFactory from Expander