Updated to remove Products