Rebuild after AssignmentID support