[master] change: Refactor DB manager

Change-Id: I2e270b19854ff426f9505fb275d0ba13118ab4e9