Added start of database handling