WIP: Support database and update test