Added new class and more code