Improves client + moves product iterator