DB change - again

Change-Id: If12f13f32a2c273ac51ccd186eb53536fe3eb2ca