Updated TODO for the upcoming release