Add TODO for the next version