Update data set and trim data attributes