more changes in DB structure