now with a few more data elements defined!