Parser: ElementExtractor added, TodoGenerator simplified