Updated for data elements