Renamed Generator to Pump for forward compatibility