add more support on the pumper and configuration