Update to version2
Start new database API for easier and more powerful access to a database source