Modified some product create orchestration code