Updated the database code to use an existing database.
Resolved merge commit