The new branch for db based method.

Signed-off-by: bazookan <aby.vinod@gmail.com>
Some minor updates

Signed-off-by: bazookan <aby.vinod@gmail.com>