[UPDATE] Refinement of Checklist data model