Refactored driver module