Added new class
Finish Feature-1