Added support for checklists