Update initAssignment logic