Added convertion for shunt