reordered the pump schema