Updated - added assignment support