Changes to pump handling to define a maximum run time for a pump