Some adjusts to pash interface, simpler worker code