Still need a fix on DbDirectory.getNextDatabase() even though it's deprecated. I shouldn't call to the delegate anymore.