Added additional data attributes for collection type output