Added new class with new methods