DB table setup changes

Change-Id: I8ceeadb7b0d50b1addf7c3792b78cab91fde7821