CL-24 : refactoring drivers and model