Added datavalue logic
Added datavalue logic