Fix assignments updating and enumeration