Add parallel expander support