Updating data attributes

@shayhowe