Do not crash if external directory not available (TODO handle better)
Allow to retrieve db name
General improvements