Added some class stuff