Changed driver code interface a little bit
Added a calling module