Added some class attributes that may help with sorting/filtering eventually