Adding currentValue field