Some more changes to DB Schema