Add a few more variables for analysis