Update with completed database design