Issue #19:  Added more details to the database model.