Update for latest Piston