Add a roadmap and minor design enhancement