Updated data attributes

@shayhowe