Some more changes to DB design