Improved how assignments are stored internally