Make ProductPushoutToProductToConnected modular