Issue #95: Database model updated.