DB modeling changes