Further Roadmap Improvements