Added a new class for future use