DDC-2476 Better approach for reverse engineer. Some refactoring done to driver.