Add support for roadmaps