+ issue #163: update for database model.