Updated to add ExpiredLabels to rows