Update roadmap to cover 2.3