Modifications to ID assignment mechanic