Added a few more variables to data extraction