Improved database module
Added driver to Database module
Improved Database module