Updated Database class

Database class is prepared to work with driver