Improved roadmap