Some changes in DB schema