Changed the iteration for data-set attributes