Modified db model