Changed table to display class