Complete AddProductGroup (no hacks)