Move piston options to a separate listener.