Add TODO for group-driven feature