Added some methods and new class