Updated data attribute names