Adding support for subtasks and tags