Added a few more columns