Refact to single DB