Updated db model