Fix management of database api