Added more data elements