Updated roadmap based on Arnaud feedback