reconfig ProductFactory to support new and late stage entry