Refactored the new class further