Added Voltage Criteria + removed Criteria handler