Adding more explict roadmap features