fixes for dual database; moved dependency definitions into the database object