Expanded and updated roadmap