Added new class
Removed default generic class