Added some more fields to display