[restructuration] : Handle external db