New changes with db

Change-Id: I84fcdbe79762abcafd25d36d67252b2e6bec308e