Modify Database design