Updated the DB model and added comments