More modifications on DB Schema