Added type conversion to assignments