Roadmap: Update based on recent changes