Driver update + refactoring
Driver update + refactoring
Add new class file