Updated Classes for Pump