Updating db to be simpler