Adapt latest changes in exdb