Improved the Database / DbDirectory, so that it does not recycle every database, which had side effects.