Add Punch as optional package.