Add: Database support to the calls