changing the db schema to consolidate