added the valuetype/valuetypeS changes