Merge branch 'dftaiwo'
Added Sub-menu to reflect roadmap