Add TODO for keyword groups