Updated Database design model