Added some class implementation