Sync with TDB refactoring