#6869: Fix imports and new DB methods